diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef1b3054b25f9b3f4b52f81dfe76778ce14d8527..964b0b1d2fc5764d1c28964300c1e4e3b50537c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,4 +193,5 @@ ENDIF(WIN32)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(tools)
+ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(unitTesting)
diff --git a/cmake b/cmake
index ce8da4f4399e3bef0c3cd825083fa350e906c7c4..597d697c4ee6f9bd4254360d9efaea15e41de340 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit ce8da4f4399e3bef0c3cd825083fa350e906c7c4
+Subproject commit 597d697c4ee6f9bd4254360d9efaea15e41de340
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index fccc5c88c19662e12fc8975b81f79be6c3cdd3d4..24a70945311f5adf9c8be8b98b0ad5832b8fac37 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -17,9 +17,7 @@ INCLUDE(../cmake/man.cmake)
 
 IF(UNIX)
   # Add `man' target.
-  ADD_CUSTOM_TARGET(
-    man ALL
-    DEPENDS dg-shell.1.gz dg-shell-plugin.1.gz)
+  ADD_CUSTOM_TARGET(man DEPENDS dg-shell.1.gz dg-shell-plugin.1.gz)
 
   # Man page generation.
   MANPAGE(dg-shell)