diff --git a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt
index e9178a5..ef96b47 100644
--- a/mariadb_config/CMakeLists.txt
+++ b/mariadb_config/CMakeLists.txt
@@ -46,6 +46,8 @@ ENDIF()
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in
                ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY)
 
 ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
 
@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
 INSTALL(TARGETS mariadb_config
         DESTINATION "bin"
         COMPONENT Development)
+INSTALL(FILES libmariadb.pc
+        DESTINATION "lib/pkgconfig"
+        COMPONENT Development)
diff --git a/mariadb_config/libmariadb.pc.in b/mariadb_config/libmariadb.pc.in
index 5cc5a21..ece1843 100644
--- a/mariadb_config/libmariadb.pc.in
+++ b/mariadb_config/libmariadb.pc.in
@@ -6,14 +6,12 @@
 #  Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/)
 #
 
-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
-prefix=@PREFIX_INSTALL_DIR@
+includedir=@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
+libdir=@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
+prefix=@CMAKE_INSTALL_PREFIX@
 
 Name: libmariadb
-Version: @LIBMARIADB_VERSION@
+Version: @MARIADB_CLIENT_VERSION@
 Description: MariaDB Connector/C dynamic library
-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
-
-
+Cflags: -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
+Libs: -L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@