diff --git a/CMakeLists.txt b/CMakeLists.txt
index 443b68f..423080a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5...4.0)
 SET(CMAKE_BUILD_TYPE Release)
 SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -Wconversion")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -Wconversion")
@@ -7,6 +7,8 @@ INCLUDE(FindPkgConfig)
 PROJECT(libdkim++)
 SET(TARGET_NAME "dkim++")
 
+INCLUDE(GNUInstallDirs)
+
 SET(TARGET_VERSION_MAJOR 2)
 SET(TARGET_VERSION_MINOR 4)
 SET(TARGET_VERSION_PATCH 0)
@@ -53,17 +55,13 @@ SUBDIRS(
 	tools
 )
 
-IF (NOT DEFINED LIB_INSTALL_DIR)
-SET(LIB_INSTALL_DIR "lib")
-ENDIF(NOT DEFINED LIB_INSTALL_DIR)
-
 FILE(GLOB_RECURSE files src/*.hpp)
-INSTALL(FILES ${files} DESTINATION include/libdkim++)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so DESTINATION lib${LIB_SUFFIX})
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so.${TARGET_VERSION} DESTINATION lib${LIB_SUFFIX})
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so.${TARGET_VERSION_MAJOR} DESTINATION lib${LIB_SUFFIX})
+INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdkim++)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so DESTINATION ${CMAKE_INSTALL_LIBDIR})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so.${TARGET_VERSION} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.so.${TARGET_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libdkim++.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdkim++.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # Make FreeBSD packages
 IF (CMAKE_SYSTEM_NAME MATCHES BSD)
diff --git a/libdkim++.pc.cmake b/libdkim++.pc.cmake
index 0c36bb7..1d6d3a3 100644
--- a/libdkim++.pc.cmake
+++ b/libdkim++.pc.cmake
@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib@LIB_SUFFIX@
-includedir=${prefix}/include
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: libdkim++
 Description: libdkim++ is a lightweight and portable DKIM (RFC4871)