diff --git a/cmake/ILCUTILConfig.cmake.in b/cmake/ILCUTILConfig.cmake.in
index d572626..5ee6a52 100644
--- a/cmake/ILCUTILConfig.cmake.in
+++ b/cmake/ILCUTILConfig.cmake.in
@@ -40,7 +40,7 @@ SET( ILCUTIL_REQUIRED_COMPONENT_VARIABLES )
 
 FOREACH( _component ${ILCUTIL_FIND_COMPONENTS} )
 
-    SET( _component_cfg_file "${ILCUTIL_ROOT}/${_component}Config.cmake" )
+    SET( _component_cfg_file "${ILCUTIL_ROOT}/lib/cmake/${_component}/${_component}Config.cmake" )
 
     IF( EXISTS "${_component_cfg_file}" )
         INCLUDE( "${_component_cfg_file}" )
diff --git a/cmakemodules/MacroGeneratePackageConfigFiles.cmake b/cmakemodules/MacroGeneratePackageConfigFiles.cmake
index 0699d46..0e8face 100644
--- a/cmakemodules/MacroGeneratePackageConfigFiles.cmake
+++ b/cmakemodules/MacroGeneratePackageConfigFiles.cmake
@@ -9,7 +9,7 @@ MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
                 CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake/${arg}.in"
                                 "${PROJECT_BINARY_DIR}/${arg}" @ONLY
                 )
-                INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION . )
+                INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/${PROJECT_NAME} )
                 #IF( EXISTS "${_current_dir}/MacroCheckPackageLibs.cmake" )
                 #    INSTALL( FILES "${_current_dir}/MacroCheckPackageLibs.cmake" DESTINATION cmake )
                 #ENDIF()
@@ -26,16 +26,16 @@ MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
                 CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake/${arg}.in"
                                 "${PROJECT_BINARY_DIR}/${arg}" @ONLY
                 )
-                INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION . )
+                INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/${PROJECT_NAME} )
                 #IF( EXISTS "${_current_dir}/MacroCheckPackageVersion.cmake" )
                 #    INSTALL( FILES "${_current_dir}/MacroCheckPackageVersion.cmake" DESTINATION cmake )
                 #ENDIF()
-            ENDIF( EXISTS "${PROJECT_SOURCE_DIR}/cmake/${arg}.in" )
+            ENDIF()
         ENDIF()
 
         IF( ${arg} MATCHES "LibDeps.cmake" )
             EXPORT_LIBRARY_DEPENDENCIES( "${arg}" )
-            INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION lib/cmake )
+            INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake )
         ENDIF()
 
     ENDFOREACH()