diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc25d960868b039ab108846c3c2e1ccc54353640..db9b193ddfab85a5f58996217e8cd3e1894e0697 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ include(DuneMacros)
 
 dune_project()
 
+add_subdirectory("doc")
 add_subdirectory("dune")
+add_subdirectory("m4")
 
 finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..428298579f3345b31e32eb76931c0841e2656786
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(doxygen)
diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f7b8ea5c993424d9524394428ec8f2ca9160b66a
--- /dev/null
+++ b/doc/doxygen/CMakeLists.txt
@@ -0,0 +1,2 @@
+# shortcut for creating the Doxyfile.in and Doxyfile
+add_doxygen_target()
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
index 99685c351ced7d190328865438793a76f8d6d8ea..2c84197caf4a9b8a3bd13bcb786aa58076c34a01 100644
--- a/m4/CMakeLists.txt
+++ b/m4/CMakeLists.txt
@@ -1,4 +1,4 @@
 install(FILES
     dune-solvers.m4
-    ipopt4.m4
+    ipopt.m4
     DESTINATION share/dune/aclocal)