diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d3f539d3..18f30f30e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,6 @@ option(ENABLE_NLS "Build with internationalisation support" YES)
 option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO)
 option(ENABLE_ROOTCA_DOWNLOAD "Download rootca.pem at build time." YES)
 option(ENABLE_SOCI_STORAGE "Turn on compilation soci storage, for messages, contacts, history" YES)
-option(ENABLE_SPHINX_DOC "Turn on the generation of the multi-language API documentation based on Sphinx. ENABLE_DOC must be set to YES in order that option be taken into account." NO)
 option(ENABLE_SQLITE_STORAGE "Turn on compilation sqlite storage, for messages, contacts, history" YES)
 option(ENABLE_STRICT "Build with strict compile options." YES)
 option(ENABLE_TOOLS "Turn on or off compilation of tools." YES)
@@ -67,6 +66,7 @@ option(ENABLE_VIDEO "Build with video support." YES)
 cmake_dependent_option(ENABLE_LIME "Enable Instant Messaging Encryption." YES "ENABLE_SQLITE_STORAGE" NO)
 cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI;NOT APPLE" NO)
 cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENABLE_GTK_UI" NO)
+cmake_dependent_option(ENABLE_SPHINX_DOC "Turn on the generation of the multi-language API documentation based on Sphinx." NO "ENABLE_DOC" NO)
 
 set(CMAKE_CXX_STANDARD 11)
 
@@ -192,7 +192,7 @@ if(ENABLE_LIME)
 	endif()
 	set(HAVE_LIME 1)
 endif()
-if(ENABLE_CXX_WRAPPER OR ENABLE_CSHARP_WRAPPER OR ENABLE_DOC)
+if(ENABLE_CXX_WRAPPER OR ENABLE_CSHARP_WRAPPER OR ENABLE_SPHINX_DOC)
 	find_package(PythonInterp REQUIRED)
 endif()
 
diff --git a/coreapi/help/doc/sphinx/CMakeLists.txt b/coreapi/help/doc/sphinx/CMakeLists.txt
index 62b06afdd..15abb7480 100644
--- a/coreapi/help/doc/sphinx/CMakeLists.txt
+++ b/coreapi/help/doc/sphinx/CMakeLists.txt
@@ -20,7 +20,7 @@
 #
 ############################################################################
 
-if (ENABLE_DOC AND ENABLE_SPHINX_DOC)
+if (ENABLE_SPHINX_DOC)
 	set(GENERATED_LANGUAGES c cpp csharp)
 	set(DOCUMENTATION_DIRS )
 	set(GENERATED_SPHINX_SOURCES )