diff --git a/CMakeLists.txt b/CMakeLists.txt
index febd61170..a16203a69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@ option(ENABLE_STATIC "Build static library." YES)
 
 option(ENABLE_CONSOLE_UI "Turn on or off compilation of console interface." YES)
 option(ENABLE_CSHARP_WRAPPER "Build the C# wrapper for Liblinphone." OFF)
+option(ENABLE_JAVA_WRAPPER "Build the Java wrapper for Liblinphone." OFF)
 option(ENABLE_CXX_WRAPPER "Build the C++ wrapper for Liblinphone." YES)
 option(ENABLE_DAEMON "Enable the linphone daemon interface." YES)
 option(ENABLE_DATE "Use build date in internal version number." NO)
@@ -170,7 +171,7 @@ if(ENABLE_LIME)
 	endif()
 	set(HAVE_LIME 1)
 endif()
-if(ENABLE_CXX_WRAPPER OR ENABLE_CSHARP_WRAPPER)
+if(ENABLE_CXX_WRAPPER OR ENABLE_CSHARP_WRAPPER OR ENABLE_JAVA_WRAPPER)
 	find_package(PythonInterp REQUIRED)
 endif()
 
@@ -355,6 +356,9 @@ endif()
 if(ENABLE_CSHARP_WRAPPER)
 	add_subdirectory(wrappers/csharp)
 endif()
+if(ENABLE_JAVA_WRAPPER)
+	add_subdirectory(wrappers/java)
+endif()
 
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
diff --git a/coreapi/help/doc/doxygen/CMakeLists.txt b/coreapi/help/doc/doxygen/CMakeLists.txt
index 2574eb772..95a5528ea 100644
--- a/coreapi/help/doc/doxygen/CMakeLists.txt
+++ b/coreapi/help/doc/doxygen/CMakeLists.txt
@@ -20,7 +20,7 @@
 #
 ################################################################################
 
-if (ENABLE_DOC OR ENABLE_CXX_WRAPPER OR ENABLE_CSHARP_WRAPPER)
+if (ENABLE_DOC OR ENABLE_CXX_WRAPPER OR ENABLE_CSHARP_WRAPPER OR ENABLE_JAVA_WRAPPER)
 	find_package(Doxygen)
 	if (DOXYGEN_FOUND)
 		if (DOXYGEN_DOT_FOUND)