diff --git a/bin/duneproject b/bin/duneproject
index 4c12bcb405da192c8fb4aae7de89d334bb25375f..d009b55095567ecf9a3589399464151e1e27ca27 100755
--- a/bin/duneproject
+++ b/bin/duneproject
@@ -245,7 +245,7 @@ echo
 echo "A sample code $MODULE.cc is generated in the \"$PROJECT\" directory."
 echo "Look at the README and dune.module files there."
 echo "Now you can run the dunecontrol script which will setup the new module."
-echo "Sometimes you may have to tweak configure.ac a bit."
+echo "Sometimes you may have to tweak configure.ac and CMakeLists.txt a bit."
 
 if test -d $PROJECT; then
   echo WARNING:
@@ -369,6 +369,10 @@ Preparing the Sources
 Additional to the software mentioned in README you'll need the
 following programs installed on your system:
 
+  cmake >= 2.8.6
+
+or if you use the old autoconf build system:
+
   automake >= 1.9
 
   autoconf >= 2.62
@@ -397,8 +401,9 @@ Most probably you'll have to provide additional information to dunecontrol
 (e. g. compilers, configure options) and/or make options.
 
 The most convenient way is to use options files in this case. The files
-defining three variables:
+defining four variables:
 
+CMAKE_FLAGS      flags passed to cmake
 AUTOGEN_FLAGS    flags passed to autogen
 CONFIGURE_FLAGS  flags passed to configure
 MAKE_FLAGS       flags passed to make
@@ -406,8 +411,12 @@ MAKE_FLAGS       flags passed to make
 An example options file might look like this:
 
 #use this options to autogen, configure and make if no other options are given
+CMAKE_FLAGS=" \\
+-DCMAKE_CXX_COMPILER=g++-4.9 \\
+-DCMAKE_CXX_FLAGS='-Wall -pedantic' \\
+-DCMAKE_INSTALL_PREFIX=/install/path" #Force g++-4.9 and set compiler flags
 AUTOGEN_FLAGS="--ac=2.50 --am=1.8" #Forces autoconf 2.50 and automake 1.8
-CONFIGURE_FLAGS="CXX=g++-3.4 --prefix=/install/path" #force g++-3.4 as compiler
+CONFIGURE_FLAGS="CXX=g++-4.9 --prefix=/install/path" #Force g++-4.9 as compiler
 MAKE_FLAGS=install #Per default run make install instead of simply make
 
 If you save this information into example.opts you can pass the opts file to
diff --git a/doc/example.opts b/doc/example.opts
index 25296402e48bd9c993d6a9ea6b2e4c04806bf44e..ef583313a6dc54d3737a8760fa75de8769ea57f8 100644
--- a/doc/example.opts
+++ b/doc/example.opts
@@ -1,4 +1,4 @@
 # use these options for configure if no options a provided on the cmdline
 AUTOGEN_FLAGS="--ac=2.50 --am=1.8"
-CONFIGURE_FLAGS="CXX=g++-3.4 --prefix='/tmp/Hu Hu'"
+CONFIGURE_FLAGS="CXX=g++-4.9 --prefix='/tmp/Hu Hu'"
 MAKE_FLAGS=install