diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41acbafe5..087d0848b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,9 @@ add_subdirectory( definitions )
 add_subdirectory( tests )
 add_subdirectory( tigge )
 add_subdirectory( examples )
-# add_subdirectory( samples )
+
+add_subdirectory( samples )
+add_subdirectory( ifs_samples ) # must come after samples
 
 # ecbuild_dont_pack( DIRS samples DONT_PACK_REGEX "*.grib" )
 
diff --git a/definitions/CMakeLists.txt b/definitions/CMakeLists.txt
index e69de29bb..5868bf4a2 100644
--- a/definitions/CMakeLists.txt
+++ b/definitions/CMakeLists.txt
@@ -0,0 +1,14 @@
+file( GLOB definition_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.def" )
+file( GLOB table_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.table" )
+
+install( FILES ${definition_files} ${table_files}  
+         DESTINATION share/${PROJECT_NAME}/definitions
+         PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
+
+install(  DIRECTORY budg cdf common grib1 grib2 gts mars tide
+          DESTINATION share/${PROJECT_NAME}/definitions
+          FILES_MATCHING 
+          PATTERN "*.def"
+          PATTERN "*.table"
+          PATTERN "4.2.192.*.table" EXCLUDE
+          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index 133188e6b..225fc4b9d 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -4,5 +4,6 @@ if( GRB_API_FORTRAN )
 
   # add here the building of fortran bindings
 
+  install( FILES grib_api_F77.h DESTINATION include/${PROJECT_NAME} )
 
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 899851c2b..142a291ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -316,3 +316,5 @@ ecbuild_add_library( TARGET    grib_api
 
 
 # TODO: add support for jpg and png
+
+install( FILES grib_api.h DESTINATION include/${PROJECT_NAME} )
diff --git a/src/extrules.am b/src/extrules.am
index f361278ce..55ab47074 100644
--- a/src/extrules.am
+++ b/src/extrules.am
@@ -13,7 +13,7 @@ proto:;-chmod +w grib_api_prototypes.h;mkptypes -A $(libgrib_api_a_prototypes) $
 test:all;(cd ../tests; make tests)
 
 templates:
-	-chmod +wgrib_templates.h
+	-chmod +w grib_templates.h
 	./grib2c.pl ../templates/*.grib
 
 grib_lex.c : gribl.l grib_yacc.h