diff --git a/config/retrodeck/reference_lists/features.json b/config/retrodeck/reference_lists/features.json
index 576fc38c..d654f1f0 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"
     },
@@ -972,12 +975,12 @@
         }
       ]
     },
-      "ruffle": {
-        "description": "Flash Games emulator",
-        "name" : "Ruffle",
-        "system" : "flash",
-        "launch": "ruffle-rd-wrapper.sh"
-      },
+    "ruffle": {
+      "description": "Flash Games emulator",
+      "name" : "Ruffle",
+      "system" : "flash",
+      "launch": "ruffle-rd-wrapper.sh"
+    },
     "melonds": {
       "description": "MelonDS Nintendo DS Emulator",
       "name": "melonds",
@@ -1105,6 +1108,12 @@
       "description": "ES-DE Emulation Frontend",
       "name": "ES-DE",
       "launch": "es-de"
+    },
+    "portmaster": {
+        "description": "PortMaster",
+        "name": "PortMaster",
+        "system": "portmaster",
+        "launch": "PortMaster"
     }
   }
 }
diff --git a/functions/post_update.sh b/functions/post_update.sh
index 8fa5338e..287d570f 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -433,6 +433,9 @@ post_update() {
     # Placeholder for version 0.9.0b
 
     set_setting_value "$raconf" "libretro_info_path" "/var/config/retroarch/cores" "retroarch"
+    # 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"
 
   # TODO: check this
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index ac3e47b9..b81c6f0a 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -857,6 +857,19 @@ prepare_component() {
     sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/gzdoom/gzdoom.ini" # This is an unfortunate one-off because set_setting_value does not currently support JSON
   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"
     log i "----------------------"
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index acda1f52..662961e1 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -524,6 +524,26 @@ modules:
         url: https://github.com/RetroDECK/MAME/releases/latest/download/RetroDECK-MAME-Artifact.tar.gz
         sha256: RETRODECKMAMELATEST
 
+  # 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.08.24-1111/retrodeck.portmaster.zip
+        sha256: 20a78192995a55ffdfdf4cd9343897c6d1ef50351a8800d188e084f90a847726
+      - type: script
+        commands:
+          - |
+            #!/bin/bash
+            "/var/data/PortMaster/PortMaster.sh" "$@"
+        dest-filename: PortMaster
+
   # ES-DE
 
   - name: ES-DE