diff --git a/CMakeLists.txt b/CMakeLists.txt
index 977438d..f964466 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc
   DESTINATION
-    ${LIB_INSTALL_DIR}/pkgconfig
+  ${CMAKE_INSTALL_LIBDIR}/pkgconfig
   COMPONENT
     pkgconfig
 )
@@ -82,7 +82,7 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
     DESTINATION
-        ${CMAKE_INSTALL_DIR}/${PROJECT_NAME}
+        ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
     COMPONENT
         devel
 )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 3c2e414..0e063de 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -10,7 +10,7 @@ include(TestBigEndian)
 set(PACKAGE ${PROJECT_NAME})
 set(VERSION ${PROJECT_VERSION})
 set(DATADIR ${DATA_INSTALL_DIR})
-set(LIBDIR ${LIB_INSTALL_DIR})
+set(LIBDIR ${CMAKE_INSTALL_LIBDIR})
 set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 
diff --git a/cmocka-config.cmake.in b/cmocka-config.cmake.in
index e92ad03..4908dba 100644
--- a/cmocka-config.cmake.in
+++ b/cmocka-config.cmake.in
@@ -4,10 +4,10 @@ if (EXISTS "${CMOCKA_CMAKE_DIR}/CMakeCache.txt")
     # In build tree
     include(${CMOCKA_CMAKE_DIR}/cmocka-build-tree-settings.cmake)
 else()
-    set(CMOCKA_INCLUDE_DIR @INCLUDE_INSTALL_DIR@)
+    set(CMOCKA_INCLUDE_DIR @CMAKE_INSTALL_FULL_INCLUDEDIR@)
 endif()
 
-set(CMOCKA_LIBRARY @LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
-set(CMOCKA_LIBRARIES @LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
+set(CMOCKA_LIBRARY @CMAKE_INSTALL_FULL_LIBDIR@/@CMOCKA_LIBRARY_NAME@)
+set(CMOCKA_LIBRARIES @CMAKE_INSTALL_FULL_LIBDIR@/@CMOCKA_LIBRARY_NAME@)
 
 mark_as_advanced(CMOCKA_LIBRARY CMOCKA_INCLUDE_DIR)
diff --git a/cmocka.pc.cmake b/cmocka.pc.cmake
index 5a302d3..f54d0a7 100644
--- a/cmocka.pc.cmake
+++ b/cmocka.pc.cmake
@@ -1,5 +1,5 @@
 Name: ${PROJECT_NAME}
 Description: The cmocka unit testing library
 Version: ${PROJECT_VERSION}
-Libs: -L${LIB_INSTALL_DIR} -lcmocka
-Cflags: -I${INCLUDE_INSTALL_DIR}
+Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lcmocka
+Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}