diff --git a/Makefile.am b/Makefile.am
index cac5713961f24675c5f7f0bbdd75f3d9e88d89da..3281582d234b7c250a6a30ddda5531f176e50fad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 # we need the module file to be able to build via dunecontrol
-EXTRA_DIST= CMakeLists.txt dune.module
+EXTRA_DIST= CMakeLists.txt dune.module dune-common-config.cmake.in  dune-common-version.cmake.in
 
 # don't follow the full GNU-standard
 # we need automake 1.9 or newer
@@ -14,3 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = CXX="$(CXX)" CC="$(CC)" --enable-parallel=@ENABLE_PA
 
 include $(top_srcdir)/am/global-rules
 include $(top_srcdir)/am/top-rules
+
+# Distribute and install config.h.cmake
+configdir = $(datadir)/dune-common
+dist_config_DATA = config.h.cmake
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
index 98f6b190ddc9b50e28e71584c87f97cd3c6dc98f..278aaa895c8f39600652b18ac18bf255abab99db 100644
--- a/cmake/modules/Makefile.am
+++ b/cmake/modules/Makefile.am
@@ -20,7 +20,7 @@ MODULES = DuneBoost.cmake \
   UseLATEX.cmake
 
 modulesdir = $(datadir)/cmake/modules
-modules_DATA = ${MODULES}
+dist_modules_DATA = ${MODULES}
 
 include $(top_srcdir)/am/global-rules
 EXTRA_DIST = CMakeLists.txt
diff --git a/cmake/pkg/Makefile.am b/cmake/pkg/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1d7d2c8a2bcd4983d7c54cc6e9da010441257cc2 100644
--- a/cmake/pkg/Makefile.am
+++ b/cmake/pkg/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = dune-common-config.cmake.in
diff --git a/cmake/scripts/Makefile.am b/cmake/scripts/Makefile.am
index 8cfe9661acd35cb51500458a92d2923e96de3e43..1d2f0c9be9e4f4df49464f1f4678e802eeb29d9e 100644
--- a/cmake/scripts/Makefile.am
+++ b/cmake/scripts/Makefile.am
@@ -5,7 +5,7 @@ MODULES = BuildTests.cmake.in \
   RunDoxygen.cmake
 
 modulesdir = $(datadir)/cmake/scripts
-modules_DATA = ${MODULES}
+dist_modules_DATA = ${MODULES}
 
 include $(top_srcdir)/am/global-rules
 EXTRA_DIST = CMakeLists.txt
diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am
index 91774c818144d654ead3be482a5c371deae3d457..17d87196d3ac10cc30e10820509fef69084f1385 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -276,4 +276,4 @@ genericiterator_compile_fail_SOURCES = genericiterator_compile_fail.cc
 
 include $(top_srcdir)/am/global-rules
 
-EXTRA_DIST = CMakeLists.txt
+EXTRA_DIST = CMakeLists.txt dummy.f