diff --git a/dune/common/CMakeLists.txt b/dune/common/CMakeLists.txt
index bc2e183ad82e3c2dd49612ecfa7c46586cc8df4a..9516f8c4d0b2b5817f20d26eaaa1eee108c6e44b 100644
--- a/dune/common/CMakeLists.txt
+++ b/dune/common/CMakeLists.txt
@@ -33,6 +33,7 @@ install(FILES
         deprecated.hh
         densematrix.hh
         densevector.hh
+	diagonalmatrix.hh
         documentation.hh
 	dotproduct.hh
         dynmatrix.hh
diff --git a/dune/common/test/CMakeLists.txt b/dune/common/test/CMakeLists.txt
index 6a831a39209531c548236887f4975133529f0985..2bf5a57663e6705ad129eb2a1a9c02f583be4e6e 100644
--- a/dune/common/test/CMakeLists.txt
+++ b/dune/common/test/CMakeLists.txt
@@ -6,6 +6,7 @@ set(TESTS
     bitsetvectortest
     check_fvector_size
     conversiontest
+    diagonalmatrixtest
     dynmatrixtest
     dynvectortest
     enumsettest
@@ -85,6 +86,9 @@ add_executable("dynmatrixtest" dynmatrixtest.cc)
 target_link_libraries("dynmatrixtest" "dunecommon")
 
 add_executable("dynvectortest" dynvectortest.cc)
+
+add_executable("diagonalmatrixtest" diagonalmatrixtest.cc)
+
 add_executable("enumsettest" enumsettest.cc)
 
 add_executable("fassigntest" fassigntest.cc)