diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bea9f72e6b102596e2bde954d32ff0ea4fcaba9..b5238ef6e56fcf302fbcbd80cc1ccb20a0d3fdeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ ENDIF( ${GRIDTYPE} MATCHES "ALBERTAGRID" )
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_config.h )
 
 # other dune modules
-ADD_DUNE_MODULES(common fem geometry grid grid-multiscale stuff)
+ADD_DUNE_MODULES(common fem geometry grid grid-multiscale stuff localfunctions)
 set(COMMON_LIBS
     ${DUNE_LIBS}
     ${BLAS_LIB}
diff --git a/cmake/cmake_config.h.in b/cmake/cmake_config.h.in
index 36b2f2e2b03922aa3566c747807bb0c9124a93de..743d41567b8ee3988490b7fd1cd7a0dc407185a4 100644
--- a/cmake/cmake_config.h.in
+++ b/cmake/cmake_config.h.in
@@ -1,21 +1,10 @@
-#ifndef DUNE_STUFF_CONFIG_H
-#define DUNE_STUFF_CONFIG_H
-
-#undef COMMIT
-
-/* the git tag / commit we build from */
-#define COMMIT "@COMMIT@"
+#ifndef DUNE_DETAILED_DISCRETIZATIONS_CONFIG_H
+#define DUNE_DETAILED_DISCRETIZATIONS_CONFIG_H
 
 #define @GRIDTYPE@
 #define GRIDDIM @GRIDDIM@
 #define POLORDER @POLORDER@
 
-#define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
-
-#ifdef NDEBUG
-	#define DNDEBUG
-#endif
-
 #include "config.h"
 
 #if !HAVE_GRIDTYPE
@@ -31,8 +20,4 @@
   }
 #endif
 
-// enable these when dropping autotools
-//#cmakedefine HAS_LAMBDA_FUNCTIONS 1
-//#cmakedefine HAS_STD_BEGIN_END 1
-
-#endif	/* DUNE_STUFF_CONFIG_H */
+#endif	/* DUNE_DETAILED_DISCRETIZATIONS_CONFIG_H */