diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 391a33e0cc..cd1d281607 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -218,9 +218,15 @@ install(TARGETS exiv2lib EXPORT exiv2Config
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
-install(FILES ${LIBEXIV2_HDR}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2
-)
+
+install(DIRECTORY ../include/exiv2 
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    FILES_MATCHING PATTERN "*.h*")
+
+install(FILES
+    ${CMAKE_BINARY_DIR}/exv_conf.h
+    ${CMAKE_BINARY_DIR}/exiv2lib_export.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
 
 install(EXPORT exiv2Config DESTINATION "share/exiv2/cmake")