diff --git a/coreapi/help/CMakeLists.txt b/coreapi/help/CMakeLists.txt
index fb6c39278..64a18c024 100644
--- a/coreapi/help/CMakeLists.txt
+++ b/coreapi/help/CMakeLists.txt
@@ -59,7 +59,7 @@ if(ENABLE_JAVADOC)
 	set(JAVADOC_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc/java")
 	set(JAVADOC_LOGFILE "${CMAKE_CURRENT_BINARY_DIR}/javadoc.log")
 	configure_file("generate_javadoc.sh.in" "generate_javadoc.sh" @ONLY)
-	add_custom_target(javadoc
+	add_custom_target(javadoc ALL
 		COMMAND "${CMAKE_CURRENT_BINARY_DIR}/generate_javadoc.sh"
 	)
 endif()
diff --git a/coreapi/help/generate_javadoc.sh.in b/coreapi/help/generate_javadoc.sh.in
index 0c4595ddb..b2af1b048 100755
--- a/coreapi/help/generate_javadoc.sh.in
+++ b/coreapi/help/generate_javadoc.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 packages='@JAVADOC_PACKAGES@'
 classpaths='@JAVADOC_CLASSPATHS@'