diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b495ecb9..90906ac8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -592,20 +592,26 @@ configure_file(tools/notcurses++.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/notcurses++.pc
   @ONLY
 )
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/notcurses++.pc
-  DESTINATION ${PKGCONFIG_DIR}
-)
 
 include(CMakePackageConfigHelpers)
 configure_file(tools/version.h.in include/version.h)
 configure_file(tools/builddef.h.in include/builddef.h)
 
+configure_package_config_file(tools/NotcursesConfig.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/NotcursesConfig.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/notcurses/cmake
+)
+
 write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/NotcursesConfigVersion.cmake
   COMPATIBILITY SameMajorVersion
 )
 
+configure_package_config_file(tools/Notcurses++Config.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Notcurses++Config.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/notcurses/cmake
+  )
+
 write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/Notcurses++ConfigVersion.cmake
   COMPATIBILITY SameMajorVersion
@@ -613,40 +619,27 @@ write_basic_package_version_file(
 
 # Installation
 install(FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/NotcursesConfig.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/NotcursesConfigVersion.cmake"
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Notcurses"
 )
 
-install(TARGETS notcurses
-  EXPORT "NotcursesTargets"
-  )
-
-install(EXPORT "NotcursesTargets"
-  NAMESPACE "notcurses::"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Notcurses"
-  FILE "NotcursesConfig.cmake"
-)
-
 install(FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/Notcurses++Config.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/Notcurses++ConfigVersion.cmake"
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Notcurses++"
   )
 
-install(TARGETS notcurses++
-  EXPORT "Notcurses++Targets"
-  )
-
-install(EXPORT "Notcurses++Targets"
-  NAMESPACE "notcurses++::"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Notcurses++"
-  FILE "Notcurses++Config.cmake"
-  )
-
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/notcurses.pc
   DESTINATION ${PKGCONFIG_DIR}
 )
 
+install(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/notcurses++.pc
+  DESTINATION ${PKGCONFIG_DIR}
+  )
+
 if(${USE_FFMPEG} OR ${USE_OIIO})
 file(GLOB TESTDATA CONFIGURE_DEPENDS data/*)
 # Don't install source materia for self-originated multimedia
diff --git a/tools/Notcurses++Config.cmake.in b/tools/Notcurses++Config.cmake.in
new file mode 100644
index 000000000..18e76dadf
--- /dev/null
+++ b/tools/Notcurses++Config.cmake.in
@@ -0,0 +1,9 @@
+@PACKAGE_INIT@
+set(Notcurses++_DIR "@PACKAGE_SOME_INSTALL_DIR@")
+
+# Compute paths
+get_filename_component(Notcurses_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(Notcurses++_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
+set(Notcurses++_LIBRARY_DIRS "@CONF_LIBRARY_DIRS@")
+
+set(Notcurses++_LIBRARIES -lnotcurses -lnotcurses++)
diff --git a/tools/NotcursesConfig.cmake.in b/tools/NotcursesConfig.cmake.in
new file mode 100644
index 000000000..1b093f97e
--- /dev/null
+++ b/tools/NotcursesConfig.cmake.in
@@ -0,0 +1,9 @@
+@PACKAGE_INIT@
+set(Notcurses_DIR "@PACKAGE_SOME_INSTALL_DIR@")
+
+# Compute paths
+get_filename_component(Notcurses_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(Notcurses_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
+set(Notcurses_LIBRARY_DIRS "@CONF_LIBRARY_DIRS@")
+
+set(Notcurses_LIBRARIES -lnotcurses)