--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,12 +219,6 @@
 else ()
   set(CMAKE_CXX_FLAGS
     "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -DUNICODE -DWCHAR_INCOMPATIBLE_XMLCH ${CMAKE_WXWINDOWS_CXX_FLAGS}")
-  if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    # TODO: with the below flag the Mac and BSD cmake-based builds fail with an error such as:
-    #   clang: error: argument unused during compilation: '-fstack-clash-protection'
-    # it's possible check_cxx_compiler_flag is using the wrong compiler for the check?
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-  endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG")
   if (USE_ASAN)
     set(CMAKE_CXX_FLAGS_DEBUG
@@ -379,8 +379,9 @@
                      COMMAND ${GZIP} ARGS -9 -n -c ${PROJECT_SOURCE_DIR}/docs/pwsafe-cli.1 > pwsafe-cli.1.gz
                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
   ADD_CUSTOM_TARGET(manpage ALL DEPENDS ${CMAKE_BINARY_DIR}/pwsafe.1.gz ${CMAKE_BINARY_DIR}/pwsafe-cli.1.gz)
-  install (FILES ${CMAKE_BINARY_DIR}/pwsafe.1.gz ${CMAKE_BINARY_DIR}/pwsafe-cli.1.gz DESTINATION "share/man/man1")
-  install (FILES "install/desktop/pwsafe.desktop" DESTINATION "share/applications")
+  install (FILES ${PROJECT_SOURCE_DIR}/docs/pwsafe.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 RENAME passwordsafe.1)
+  install (FILES ${PROJECT_SOURCE_DIR}/docs/pwsafe-cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 RENAME passwordsafe-cli.1)
+  install (FILES "install/desktop/pwsafe.desktop" DESTINATION "share/applications" RENAME "passwordsafe.desktop")
   install (FILES "install/metainfo/org.pwsafe.pwsafe.metainfo.xml" DESTINATION "share/metainfo")
   install (FILES "install/graphics/48x48/pwsafe.png" DESTINATION "share/icons/hicolor/48x48/apps/")
   install (FILES "install/graphics/128x128/pwsafe.png" DESTINATION "share/icons/hicolor/128x128/apps/")
--- a/CMakeModules/harden/harden-gcc.cmake
+++ b/CMakeModules/harden/harden-gcc.cmake
@@ -42,7 +42,6 @@
 
 harden_add_compile_option(-Wformat HARDEN_COMPILE_WFORMAT FALSE)
 harden_add_compile_option(-Wformat-security HARDEN_COMPILE_WFORMAT_SECURITY FALSE)
-harden_add_compile_option(-Werror=format-security HARDEN_COMPILE_WERROR_FORMAT_SECURITY FALSE)
 harden_add_compile_option(-fstack-clash-protection HARDEN_COMPILE_STACK_CLASH_PROTECTION  FALSE)
 
 option(HARDEN_USE_SAFE_STACK "Enable the SafeStack sanitizer" ON)