diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 957a8a73..b3a6ac56 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -892,8 +892,10 @@ prepare_component() {
 
     rm -rf "/var/data/PortMaster"
     unzip "/app/retrodeck/PortMaster.zip" -d "/var/data/"
+    cp -f "/var/data/PortMaster/retrodeck/PortMaster.txt" "/var/data/PortMaster/PortMaster.sh"
     chmod +x "/var/data/PortMaster/PortMaster.sh"
-    ln -s "/app/bin/PortMaster" "$roms_folder/portmaster/PortMaster.sh"
+    rm -f "$roms_folder/portmaster/PortMaster.sh"
+    install -Dm755 "/var/data/PortMaster/PortMaster.sh" "$roms_folder/portmaster/PortMaster.sh"
   fi
 
   if [[ "$component" =~ ^(ruffle|all)$ ]]; then
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 7b8bfd47..43cba474 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -610,19 +610,26 @@ modules:
     buildsystem: simple
     build-commands:
       - mkdir -p "${FLATPAK_DEST}/retrodeck/PortMaster/"
-      - cp retrodeck.portmaster.zip "${FLATPAK_DEST}/retrodeck/PortMaster.zip"
       - install -Dm755 "PortMaster" "${FLATPAK_DEST}/bin/PortMaster"
-      - ls -lah "${FLATPAK_DEST}/bin"
+      - install -Dm755 "harbourmaster" "${FLATPAK_DEST}/bin/harbourmaster"
+      - cp PortMaster.zip "${FLATPAK_DEST}/retrodeck/PortMaster.zip"
     sources:
       - type: file
         url: https://github.com/PortsMaster/PortMaster-GUI/releases/download/2024.09.13-1455/retrodeck.portmaster.zip
         sha256: 4fe3ce3ffdc1d66fe235c8a1a6062a86aa06ee615dba1fe5fc6e9bdd75e9d39c
+        dest-filename: PortMaster.zip
       - type: script
         commands:
           - |
             #!/bin/bash
             "/var/data/PortMaster/PortMaster.sh" "$@"
         dest-filename: PortMaster
+      - type: script
+        commands:
+          - |
+            #!/bin/bash
+            "/var/data/PortMaster/harbourmaster" "$@"
+        dest-filename: harbourmaster
 
   # ES-DE