diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index f47a0a9f5..fc4e508a2 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -42,7 +42,7 @@ add_calamares_translations( ${CALAMARES_TRANSLATION_LANGUAGES} )
 set( final_src ${calamaresUi_H} ${calamaresSources} ${calamaresRc} ${trans_outfile} )
 
 add_executable( calamares_bin ${final_src} )
-SET_TARGET_PROPERTIES(calamares_bin
+set_target_properties(calamares_bin
     PROPERTIES
         AUTOMOC TRUE
         ENABLE_EXPORTS TRUE
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 3ee03dd96..94e9145d6 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -92,9 +92,8 @@ target_link_libraries( calamares
 
 install( TARGETS calamares
     EXPORT CalamaresLibraryDepends
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/calamares/
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/calamares/
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 # Install header files
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 9ef52716b..4d0ec8281 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -79,5 +79,4 @@ calamares_add_library( calamaresui
     RESOURCES libcalamaresui.qrc
     EXPORT CalamaresLibraryDepends
     NO_VERSION
-    INSTALL_BINDIR ${CMAKE_INSTALL_LIBDIR}/calamares/
 )