diff --git a/RPLYConfig.cmake.in b/RPLYConfig.cmake.in
index aad66da..5c4ec64 100644
--- a/RPLYConfig.cmake.in
+++ b/RPLYConfig.cmake.in
@@ -1,6 +1,6 @@
 # The RPLY library directory.
-SET(RPLY_LIBRARY_DIR "@LIB_INSTALL_DIR@")
-SET(RPLY_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@")
+SET(RPLY_LIBRARY_DIR "@CMAKE_INSTALL_LIBDIR@")
+SET(RPLY_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
 SET(RPLY_LIBRARY "@RPLY_LIBRARY@")
 
 
diff --git a/rply_CMakeLists.txt b/rply_CMakeLists.txt
index b4086e6..d6d177b 100644
--- a/rply_CMakeLists.txt
+++ b/rply_CMakeLists.txt
@@ -1,6 +1,8 @@
 PROJECT(rply)
 cmake_minimum_required(VERSION 2.6)
 
+include(GNUInstallDirs)
+
 SET(RPLY_LIB_MAJOR_VERSION 1)
 SET(RPLY_LIB_MINOR_VERSION 01)
 
@@ -25,13 +27,10 @@ target_link_libraries (rply_sconvert rply)
 install(FILES rply.h DESTINATION include/rply)
 
 # Installs the target file
-install(TARGETS rply LIBRARY DESTINATION lib${LIB_SUFFIX})
+install(TARGETS rply LIBRARY DESTINATION ${LIBDIR})
 install(TARGETS rply_convert RUNTIME DESTINATION bin)
 install(TARGETS rply_dump RUNTIME DESTINATION bin)
 install(TARGETS rply_sconvert RUNTIME DESTINATION bin)
 
 #This should be the last line of the project
 SUBDIRS( CMake/export )
-
-
-