diff --git a/cmake/backbone b/cmake/backbone
index e294fa0..df96ceb 160000
--- a/cmake/backbone
+++ b/cmake/backbone
@@ -1 +1 @@
-Subproject commit e294fa055e6107a337369fdedb0f16ae575ec64b
+Subproject commit df96ceb0b067844d341f0405db7c10def84d772c
diff --git a/cpack/CMakeLists.txt b/cpack/CMakeLists.txt
index 1942852..7f53638 100644
--- a/cpack/CMakeLists.txt
+++ b/cpack/CMakeLists.txt
@@ -1,10 +1,9 @@
 SET (CONTACT "backbone@backbone.ws")
-SET (DEBIAN_DEPENDENCIES "valac (>= 0.24), libglib2.0-bin (>= 2.33)" )
+SET (DEBIAN_DEPENDENCIES "valac (>= 0.24)" )
 SET (DEBIAN_SECTION "Libraries")
-SET (REDHAT_DEPENDENCIES "vala >= 0.24, glib >= 2.33")
+SET (REDHAT_DEPENDENCIES "vala >= 0.24")
 SET (REDHAT_SECTION "Applications/System")
 SET (LICENSE "LGPLv3+")
 SET (WIN32_UNINSTALL_NAME "GSchTst") # <= 8 symbols for the name
 
-LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-INCLUDE (CPackCommon)
+INCLUDE (CPackCommonRules)
diff --git a/pkg-config/CMakeLists.txt b/pkg-config/CMakeLists.txt
index 77cb03a..d349889 100644
--- a/pkg-config/CMakeLists.txt
+++ b/pkg-config/CMakeLists.txt
@@ -1,22 +1,6 @@
-# configure pkg-config file
-IF (WIN32)
-  SET (PkgConfigPrefix "")
-ELSE ()
-  SET (PkgConfigPrefix ${CMAKE_INSTALL_PREFIX})
-ENDIF ()
-SET (PkgConfigExecPrefix "\${prefix}")
-SET (PkgConfigLibDir "\${exec_prefix}/lib")
-SET (PkgConfigIncludeDir "\${prefix}/include")
-
-SET (PkgConfigName "${CMAKE_PROJECT_NAME}")
-SET (PkgConfigDescription "${PROJECT_DESCRIPTION}")
-SET (PkgConfigVersion "${MAJOR}.${MINOR}.${PATCH}")
-SET (PkgConfigLibs "-L\${libdir}")
-SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-${MAJOR}")
-SET (PkgConfigLibsPrivate "")
-SET (PkgConfigCflags "")
+INCLUDE (PkgConfigCommonRules)
 
 CONFIGURE_FILE (
-  "${CMAKE_CURRENT_SOURCE_DIR}/pkg-config.pc.in"
+  "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/pkg-config.pc.in"
   "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc"
 )
diff --git a/pkg-config/pkg-config.pc.in b/pkg-config/pkg-config.pc.in
deleted file mode 100644
index ad5264d..0000000
--- a/pkg-config/pkg-config.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PkgConfigPrefix@
-exec_prefix=@PkgConfigExecPrefix@
-libdir=@PkgConfigLibDir@
-includedir=@PkgConfigIncludeDir@
-
-Name: @PkgConfigName@
-Description: @PkgConfigDescription@
-Version: @PkgConfigVersion@
-Libs: @PkgConfigLibs@
-Libs.private: @PkgConfigLibsPrivate@
-Cflags: @PkgConfigCflags@