diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 8929261c..f3812a6a 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1242,6 +1242,29 @@ modules:
 
   # Ryujinx Appimage - END
 
+  # PortMaster - START
+
+  - name: portmaster
+    buildsystem: simple
+    build-commands:
+      - |
+        chmod +x ./Install.PortMaster.sh 
+        ./Install.PortMaster.sh --nox11 --accept --target PortMaster
+        sed -i 's#/roms/ports/PortMaster#/var/config/PortMaster#g' PortMaster/PortMaster.sh # set controlfolder in /var/config/PortMaster
+        sed -i '/printf "\\\\033c" > \$CUR_TTY/d' PortMaster/PortMaster.sh                  # remove tty cleanup
+        sed -i 's/ > $CUR_TTY//g' PortMaster/PortMaster.sh                                  # removing the tty redirection
+        sed -i 's/ESUDO="sudo"/ESUDO=""/' PortMaster/PortMaster.sh                          # remove $ESDUO as we cannot invoke sudo in flatpak
+        sed -i '/\/dev\/\*/d' ports/*/*.sh                                                  # remove all the lines that are writing on /dev/something as we cannot do that in flatpak
+        sed -i '/systemctl/d' ports/*/*.sh                                                  # remove all the lines that uses systemctl commands as we cannot use them in flatpak
+        mv PortMaster ${FLATPAK_DEST}/retrodeck/PortMaster
+        mv PortMaster.sh ${FLATPAK_DEST}/bin/PortMaster.sh
+    sources:
+      - type: file
+        url: https://github.com/PortsMaster/PortMaster-GUI/releases/download/2024.03.26-1245/Install.PortMaster.sh
+        commit: 0bdd136e9d919c269796937ca14cadafacbedc52c3b1ba38569748d7046ba96d
+
+  # PortMaster - END
+
   # External manifests end
 
   - name: retrodeck
diff --git a/rd-submodules/ryujinx b/rd-submodules/ryujinx
index ea1dae93..35d4fce1 160000
--- a/rd-submodules/ryujinx
+++ b/rd-submodules/ryujinx
@@ -1 +1 @@
-Subproject commit ea1dae930a6f61388c2b5e05f95bb6ed0120926e
+Subproject commit 35d4fce1b9959b8568838659ea7e8c239139d3c8