diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b41a70cb..1d5eed408 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -534,7 +534,9 @@ if (GLFW_INSTALL)
                   "${GLFW_BINARY_DIR}/src/glfw3ConfigVersion.cmake"
             DESTINATION ${GLFW_CONFIG_PATH})
 
-    install(EXPORT glfwTargets DESTINATION ${GLFW_CONFIG_PATH})
+    install(EXPORT glfwTargets FILE glfw3Targets.cmake
+            DESTINATION ${GLFW_CONFIG_PATH})
+
     install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
             DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
diff --git a/src/glfw3Config.cmake.in b/src/glfw3Config.cmake.in
index 3749c792c..9ecc3b0a2 100644
--- a/src/glfw3Config.cmake.in
+++ b/src/glfw3Config.cmake.in
@@ -11,6 +11,5 @@ set(GLFW3_VERSION "@GLFW_VERSION_FULL@")
 set_and_check(GLFW3_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/include")
 set_and_check(GLFW3_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@")
 
-find_library(GLFW3_LIBRARY "@GLFW_LIB_NAME@" HINTS ${GLFW3_LIBRARY_DIR})
-
-set(GLFW_LIBRARIES "@GLFW_LIBRARIES@")
+include("@PACKAGE_CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@/cmake/glfw/glfw3Targets.cmake")
+set(GLFW3_LIBRARY glfw)