diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16ce9f2c..cbfd4776 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ if (BUILDDOC)
   endif (DOXYGEN_FOUND)
   # check if Sphinx is installed and add target to generate API documentation
   find_package (Sphinx)
-  if(SPHINX_FOUND AND BUILDSWIGPYTHON)
+  if(SPHINX_FOUND AND BUILDSWIG AND BUILDSWIGPYTHON)
     # python required for Sphinx build
     find_package (PythonLibs)
     string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 02f99434..6fdd2d4d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,6 +66,7 @@ macro(upm_doxygen)
     add_dependencies (${libname}doc_i doc)
     if (BUILDSWIG)
       add_dependencies (_pyupm_${libname} ${libname}doc_i)
+	  add_dependencies (pydoc _pyupm_${libname})
     else ()
       add_dependencies (${libname} doc)
     endif ()