diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index de96969..c28c7f8 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -24,7 +24,17 @@ if (CPACK_GENERATOR MATCHES "NSIS")
   set (CPACK_SET_DESTDIR FALSE)
   set (CPACK_STRIP_FILES FALSE)	# breaks Qt packaging on Windows
 
-  set (CPACK_NSIS_INSTALL_ROOT "C:\\FT8Call")
+  # set (CPACK_NSIS_INSTALL_ROOT "C:\\FT8Call")
+
+  if(CMAKE_CL_64) 
+    set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") 
+    set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} (Win64)") 
+    set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION} (Win64)") 
+  else() 
+    set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES") 
+    set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}") 
+    set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}") 
+  endif()
 
   # set the install/unistall icon used for the installer itself
   # There is a bug in NSI that does not handle full unix paths properly.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fc67ac..a13e381 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1401,6 +1401,7 @@ if (UNIX)
   endif (NOT APPLE)
 endif (UNIX)
 
+
 #
 # installation
 #
@@ -1481,7 +1482,6 @@ if (APPLE)
     )
 endif (APPLE)
 
-
 #
 # uninstall support
 #
@@ -1519,18 +1519,25 @@ configure_file (
 
 
 if (NOT WIN32 AND NOT APPLE)
-  # install a desktop file so wsjtx appears in the application start
+  # install a desktop file so ft8call appears in the application start
   # menu with an icon
   install (
-    FILES ft8call.desktop message_aggregator.desktop
-    DESTINATION share/applications
+    FILES ft8call.desktop
+    DESTINATION /usr/share/applications
     #COMPONENT runtime
     )
   install (
     FILES icons/Unix/wsjtx_icon.png
-    DESTINATION share/pixmaps
+    DESTINATION /usr/share/pixmaps
     #COMPONENT runtime
     )
+
+    execute_process(COMMAND ln -s /opt/ft8call/bin/ft8call lft8call)
+
+    install(FILES
+        ${CMAKE_BINARY_DIR}/lft8call DESTINATION /usr/bin/ RENAME ft8call
+        #COMPONENT runtime
+    )
 endif (NOT WIN32 AND NOT APPLE)