diff --git a/CMakeLists.txt b/CMakeLists.txt
index de141abd27..296ff23360 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,7 @@ endif()
 
 include(cmake/compilerFlagsExiv2.cmake REQUIRED)
 
+add_subdirectory( include )
 add_subdirectory( src )
 
 if( EXIV2_BUILD_UNIT_TESTS )
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 0000000000..01b43a6c6f
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(exiv2)
diff --git a/include/exiv2/CMakeLists.txt b/include/exiv2/CMakeLists.txt
new file mode 100644
index 0000000000..60080f1c27
--- /dev/null
+++ b/include/exiv2/CMakeLists.txt
@@ -0,0 +1,51 @@
+install(FILES
+            asfvideo.hpp
+            basicio.hpp
+            bigtiffimage.hpp
+            bmpimage.hpp
+            config.h
+            convert.hpp
+            cr2image.hpp
+            crwimage.hpp
+            datasets.hpp
+            easyaccess.hpp
+            epsimage.hpp
+            error.hpp
+            exif.hpp
+            exiv2.hpp
+            futils.hpp
+            gifimage.hpp
+            http.hpp
+            image.hpp
+            ini.hpp
+            iptc.hpp
+            jp2image.hpp
+            jpgimage.hpp
+            matroskavideo.hpp
+            metadatum.hpp
+            mrwimage.hpp
+            orfimage.hpp
+            pgfimage.hpp
+            pngimage.hpp
+            preview.hpp
+            properties.hpp
+            psdimage.hpp
+            quicktimevideo.hpp
+            rafimage.hpp
+            riffvideo.hpp
+            rw2image.hpp
+            rwlock.hpp
+            slice.hpp
+            ssh.hpp
+            tags.hpp
+            tgaimage.hpp
+            tiffimage.hpp
+            types.hpp
+            utilsvideo.hpp
+            value.hpp
+            version.hpp
+            webpimage.hpp
+            xmp_exiv2.hpp
+            xmpsidecar.hpp
+        DESTINATION
+            ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d75389b20..32137c0f4b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -225,10 +225,6 @@ install(TARGETS exiv2lib EXPORT exiv2Config
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
-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