diff --git a/LaunchAPPL/Server/CMakeLists.txt b/LaunchAPPL/Server/CMakeLists.txt
index f3d3cc17dc..8dd4496521 100644
--- a/LaunchAPPL/Server/CMakeLists.txt
+++ b/LaunchAPPL/Server/CMakeLists.txt
@@ -23,13 +23,16 @@ endif()
 
 set(HAVE_NAVIGATION NO)
 if(HAVE_NAVIGATION_H)
-    if(CMAKE_SYSTEM_NAME MATCHES Retro68)
+    if(CMAKE_SYSTEM_NAME MATCHES RetroPPC)
+        find_library(NAVIGATION_LIBRARY NAMES libNavigation.a)
+    elseif(CMAKE_SYSTEM_NAME MATCHES Retro68)
         find_library(NAVIGATION_LIBRARY NAMES Navigation.far)
-        if(NAVIGATION_LIBRARY)
-            set(HAVE_NAVIGATION YES)
-        endif()
     else()
         set(HAVE_NAVIGATION YES)
+        set(NAVIGATION_LIBRARY)
+    endif()
+    if(NAVIGATION_LIBRARY)
+        set(HAVE_NAVIGATION YES)
     endif()
 endif()
 
@@ -144,11 +147,6 @@ if(HAVE_OPENTRANSPORT)
     endif()
 endif()
 
-if(HAVE_NAVIGATION)
-    if(CMAKE_SYSTEM_NAME MATCHES RetroPPC)
-        target_link_libraries(LaunchAPPLServer -lNavigationLib)
-    endif()
-    if(CMAKE_SYSTEM_NAME MATCHES Retro68)
-        target_link_libraries(LaunchAPPLServer -lNavigation.far)
-    endif()
+if(NAVIGATION_LIBRARY)
+    target_link_libraries(LaunchAPPLServer ${NAVIGATION_LIBRARY})
 endif()