diff --git a/CMakeLists.txt b/CMakeLists.txt
index c058e296f5..569ad658ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1391,13 +1391,22 @@ foreach(__ext_pair "psmp:popt" "ssmp:sopt")
   list(GET __ext_list 0 __src_ext)
   list(GET __ext_list 1 __link_ext)
   if(__cp2k_ext MATCHES ${__src_ext})
+    if(IS_ABSOLUTE "${CMAKE_INSTALL_BINDIR}")
+      set(__cp2k_alias_bindir "${CMAKE_INSTALL_BINDIR}")
+    else()
+      set(__cp2k_alias_bindir
+          "\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
+    endif()
+
     install(
       CODE "
+      set(__cp2k_alias_bindir \"\$ENV{DESTDIR}${__cp2k_alias_bindir}\")
       message(STATUS \"Creating symlink: cp2k.${__link_ext} -> cp2k.${__src_ext}\")
       execute_process(
-        COMMAND ${CMAKE_COMMAND} -E create_symlink
-          cp2k.${__src_ext}
-          \${CMAKE_INSTALL_PREFIX}/bin/cp2k.${__link_ext})
+        COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+          \"cp2k.${__src_ext}\"
+          \"\${__cp2k_alias_bindir}/cp2k.${__link_ext}\"
+        COMMAND_ERROR_IS_FATAL ANY)
     ")
   endif()
 endforeach()
diff --git a/tools/fedora/cp2k.spec b/tools/fedora/cp2k.spec
index 0e62cf7a4c..f55f181b1d 100644
--- a/tools/fedora/cp2k.spec
+++ b/tools/fedora/cp2k.spec
@@ -232,6 +232,7 @@ done
 
 %files
 %{_bindir}/cp2k.ssmp
+%{_bindir}/cp2k.sopt
 %{_bindir}/dbm_miniapp.ssmp
 %{_bindir}/dumpdcd.ssmp
 %{_bindir}/graph.ssmp
@@ -248,6 +249,7 @@ done
 
 %files openmpi
 %{_libdir}/openmpi/bin/cp2k.psmp
+%{_libdir}/openmpi/bin/cp2k.popt
 %{_libdir}/openmpi/bin/dumpdcd.psmp
 %{_libdir}/openmpi/bin/dbm_miniapp.psmp
 %{_libdir}/openmpi/bin/graph.psmp
@@ -264,6 +266,7 @@ done
 
 %files mpich
 %{_libdir}/mpich/bin/cp2k.psmp
+%{_libdir}/mpich/bin/cp2k.popt
 %{_libdir}/mpich/bin/dbm_miniapp.psmp
 %{_libdir}/mpich/bin/dumpdcd.psmp
 %{_libdir}/mpich/bin/graph.psmp