diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68f199a18..fafef95bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,6 +148,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lept.pc DESTINATION lib/pkgconfig)
 install(FILES
     ${CMAKE_BINARY_DIR}/LeptonicaConfig.cmake
     ${CMAKE_BINARY_DIR}/LeptonicaConfig-version.cmake
-    DESTINATION cmake)
+    DESTINATION lib/cmake/${PROJECT_NAME})
 
 ###############################################################################
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a65e87e09..a0b7e17c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,7 +53,7 @@ if (UNIX)
 endif()
 
 if (NOT CPPAN_BUILD)
-    export(TARGETS leptonica FILE ${CMAKE_BINARY_DIR}/LeptonicaTargets.cmake)
+#    export(TARGETS leptonica FILE ${CMAKE_BINARY_DIR}/LeptonicaTargets.cmake)
 else()
     target_link_libraries       (leptonica
         pvt.cppan.demo.gif
@@ -67,8 +67,8 @@ else()
     export(TARGETS leptonica APPEND FILE ${CMAKE_BINARY_DIR}/LeptonicaTargets.cmake)
 endif()
 
-install(TARGETS leptonica EXPORT LeptonicaTargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-install(EXPORT LeptonicaTargets DESTINATION cmake)
+install(TARGETS leptonica EXPORT LeptonicaTargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib INCLUDES DESTINATION include)
+install(EXPORT LeptonicaTargets DESTINATION lib/cmake/${PROJECT_NAME})
 install(FILES
     ${hdr}
     ${CMAKE_BINARY_DIR}/src/endianness.h