diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd79ac10e..3ec381239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,7 @@ endif ()
 find_package(libusb REQUIRED)
 
 if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
+    add_subdirectory(cmake/pkgconfig)
     find_package(PkgConfig)
     pkg_check_modules(GTK3 gtk+-3.0)
 endif ()
@@ -269,7 +270,6 @@ add_subdirectory(tests)
 add_subdirectory(cmake/packaging)
 include(cmake/packaging/cpack_config.cmake)
 
-
 ###
 # Uninstall target
 ###
diff --git a/cmake/pkgconfig/CMakeLists.txt b/cmake/pkgconfig/CMakeLists.txt
new file mode 100644
index 000000000..53870fee4
--- /dev/null
+++ b/cmake/pkgconfig/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(PKG_CONFIG_LIBDIR     "\${prefix}/lib/\${deb_host_multiarch}")
+set(PKG_CONFIG_INCLUDEDIR "\${prefix}/include/\${deb_host_multiarch}/${PROJECT_NAME}")
+set(PKG_CONFIG_LIBS       "-L\${libdir} -l:libstlink.so.${PROJECT_VERSION_MAJOR}")
+set(PKG_CONFIG_CFLAGS     "-I\${includedir}")
+set(PKG_CONFIG_REQUIRES   "libusb-1.0")
+
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.pc.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+    )
+
+install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+    DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig
+    )
diff --git a/debian/pkg-config/pkg-config.pc.cmake b/cmake/pkgconfig/pkgconfig.pc.cmake
similarity index 99%
rename from debian/pkg-config/pkg-config.pc.cmake
rename to cmake/pkgconfig/pkgconfig.pc.cmake
index c00eb070e..4f881daec 100644
--- a/debian/pkg-config/pkg-config.pc.cmake
+++ b/cmake/pkgconfig/pkgconfig.pc.cmake
@@ -1,10 +1,11 @@
+prefix=${CMAKE_INSTALL_PREFIX}
 deb_host_multiarch=${CMAKE_LIBRARY_PATH}
+libdir=${PKG_CONFIG_LIBDIR}
+includedir=${PKG_CONFIG_INCLUDEDIR}
+
 Name: ${PROJECT_NAME}
 Description: ${PROJECT_DESCRIPTION}
 Version: ${PROJECT_VERSION}
-Requires: ${PKG_CONFIG_REQUIRES}
-prefix=${CMAKE_INSTALL_PREFIX}
-includedir=${PKG_CONFIG_INCLUDEDIR}
-libdir=${PKG_CONFIG_LIBDIR}
 Libs: ${PKG_CONFIG_LIBS}
 Cflags: ${PKG_CONFIG_CFLAGS}
+Requires: ${PKG_CONFIG_REQUIRES}
diff --git a/debian/pkg-config/CMakeLists.txt b/debian/pkg-config/CMakeLists.txt
deleted file mode 100644
index fa3a326a8..000000000
--- a/debian/pkg-config/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-#set(PKG_CONFIG_LIBDIR     "\${prefix}/lib/\${deb_host_multiarch}")
-#set(PKG_CONFIG_INCLUDEDIR "\${prefix}/include/\${deb_host_multiarch}/${PROJECT_NAME}")
-#set(PKG_CONFIG_LIBS       "-L\${libdir} -l:libstlink.so.${PROJECT_VERSION_MAJOR}")
-#set(PKG_CONFIG_CFLAGS     "-I\${includedir}")
-#set(PKG_CONFIG_REQUIRES   "libusb-1.0")
-
-#configure_file(
-#    "${CMAKE_CURRENT_SOURCE_DIR}/pkg-config.pc.cmake"
-#    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
-#    )
-
-#install(
-#    FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
-#    DESTINATION ${STLINK_LIBRARY_PATH}/debian/
-#    )