diff --git a/CMakeLists.txt b/CMakeLists.txt
index 823ca4dfb..91429ee31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -633,16 +633,16 @@ endif()
 # CMAKE FILES
 ###############################################################################
 
-install(EXPORT lvr2Targets
-    FILE lvr2Targets.cmake
-    NAMESPACE lvr2::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lvr2)
-
 include(CMakePackageConfigHelpers)
 set(INCLUDE_INSTALL_DIR include/)
 set(LIB_INSTALL_DIR lib/)
 set(SYSCONFIG_INSTALL_DIR etc/lvr2/)
 
+install(EXPORT lvr2Targets
+    FILE lvr2Targets.cmake
+    NAMESPACE lvr2::
+    DESTINATION ${LIB_INSTALL_DIR}/cmake/lvr2)
+
 configure_package_config_file(LVR2Config.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/LVR2Config.cmake
   INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/lvr2
@@ -669,7 +669,7 @@ install(FILES
     CMakeModules/FindOpenNI2.cmake
     CMakeModules/FindQVTK.cmake
     CMakeModules/FindSTANN.cmake
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lvr2/Modules)
+    DESTINATION ${LIB_INSTALL_DIR}/cmake/lvr2/Modules)
 
 
 ###############################################################################
diff --git a/LVR2Config.cmake.in b/LVR2Config.cmake.in
index c859d9bf1..f92ea8bc8 100644
--- a/LVR2Config.cmake.in
+++ b/LVR2Config.cmake.in
@@ -8,6 +8,7 @@
 # - LVR2_INCLUDE_DIRS
 # - LVR2_DEFINITIONS
 # - LVR2_LIBRARIES
+# - LVR2_LIBRARY
 #
 # Do not forget to add_defintions(${LVR2_DEFINITIONS}) as they
 # describe the build configuration of liblvr.
@@ -24,11 +25,15 @@ cmake_policy(SET CMP0012 NEW)
 set(LVR2_INCLUDE_DIRS @LVR2_INSTALL_INCLUDE_DIRS@)
 set(LVR2_DEFINITIONS @LVR2_DEFINITIONS@)
 
+find_package(PkgConfig REQUIRED)
+
 option(LVR2_USE_STATIC_LIBS OFF)
 if(LVR2_USE_STATIC_LIBS)
-  set(LVR2_LIBRARIES lvr2_static)
+  find_library(LVR2_LIBRARY NAMES lvr2_static)
+  set(LVR2_LIBRARIES ${LVR2_LIBRARY})
 else()
-  set(LVR2_LIBRARIES lvr2)
+  find_library(LVR2_LIBRARY NAMES lvr2)
+  set(LVR2_LIBRARIES ${LVR2_LIBRARY})
 endif()
 
 find_package(OpenCV REQUIRED)