diff --git a/config/retrodeck/reference_lists/features.json b/config/retrodeck/reference_lists/features.json
index a118e364..63a57a74 100644
--- a/config/retrodeck/reference_lists/features.json
+++ b/config/retrodeck/reference_lists/features.json
@@ -620,6 +620,9 @@
     "pokemini": {
       "name": "Nintendo Pokémon Mini"
     },
+    "portmaster": {
+      "name": "PortMaster"
+    },
     "ports": {
       "name": "Ports"
     },
@@ -1138,6 +1141,12 @@
       "description": "Steam ROM Manager (used to sync RetroDECK favorites with Steam)",
       "name": "Steam ROM Manager",
       "launch": "steam-rom-manager"
+    },
+    "portmaster": {
+      "description": "PortMaster",
+      "name": "PortMaster",
+      "system": "portmaster",
+      "launch": "PortMaster"
     }
   }
 }
diff --git a/functions/post_update.sh b/functions/post_update.sh
index 3ad4c2d3..80730f89 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -434,6 +434,9 @@ post_update() {
 
     set_setting_value "$raconf" "libretro_info_path" "/var/config/retroarch/cores" "retroarch"
     prepare_component "reset" "shadps4"
+    # TODO: Configurator dialog: Hey, we need to reset ES-DE! (because again ES-DE folders, new theme and such)
+    prepare_component "reset" "es-de"
+    prepare_component "reset" "portmaster"
     prepare_component "reset" "ruffle"
     prepare_component "reset" "steam-rom-manager"
     update_rd_conf
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index a152238b..957a8a73 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -882,6 +882,19 @@ prepare_component() {
 
     # TODO: plceholder
   fi
+  
+  if [[ "$component" =~ ^(portmaster|all)$ ]]; then
+  component_found="true"
+    # TODO: MultiUser
+    log i "----------------------"
+    log i "Prepearing PortMaster"
+    log i "----------------------"
+
+    rm -rf "/var/data/PortMaster"
+    unzip "/app/retrodeck/PortMaster.zip" -d "/var/data/"
+    chmod +x "/var/data/PortMaster/PortMaster.sh"
+    ln -s "/app/bin/PortMaster" "$roms_folder/portmaster/PortMaster.sh"
+  fi
 
   if [[ "$component" =~ ^(ruffle|all)$ ]]; then
   component_found="true"
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index e723bd71..a3bbb19f 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -603,6 +603,26 @@ modules:
       - type: archive
         url: https://github.com/shadps4-emu/shadPS4/releases/latest/download/shadps4-linux-qt.zip
         sha256: RETRODECKSHADPS4LATESTSTABLE
+        
+  # PortMaster
+
+  - name: PortMaster
+    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"
+    sources:
+      - type: file
+        url: https://github.com/PortsMaster/PortMaster-GUI/releases/download/2024.09.13-1455/retrodeck.portmaster.zip
+        sha256: 4fe3ce3ffdc1d66fe235c8a1a6062a86aa06ee615dba1fe5fc6e9bdd75e9d39c
+      - type: script
+        commands:
+          - |
+            #!/bin/bash
+            "/var/data/PortMaster/PortMaster.sh" "$@"
+        dest-filename: PortMaster
 
   # ES-DE