diff --git a/.gitmodules b/.gitmodules
index 1e7a9909..9d6f4fb6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "shared-modules"]
 	path = shared-modules
 	url = https://github.com/flathub/shared-modules.git
+[submodule "rd-submodules/retroarch"]
+	path = rd-submodules/retroarch
+	url = https://github.com/flathub/org.libretro.RetroArch.git
diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 890e1b65..c4e16339 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -205,8 +205,8 @@ modules:
       - mkdir -p ${FLATPAK_DEST}/share/appdata
       - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata
     modules:
-      - libpng/libpng-1.6.35.json
-      - nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
+      - rd-submodules/retroarch/libpng/libpng-1.6.35.json
+      - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
       - shared-modules/SDL/SDL-1.2.15.json
       - shared-modules/SDL/SDL_image-1.2.12.json
       - shared-modules/SDL/SDL_mixer-1.2.12.json
@@ -214,11 +214,11 @@ modules:
       - shared-modules/SDL/SDL_ttf-2.0.11.json
       - shared-modules/libusb/libusb.json
       - shared-modules/gudev/gudev.json
-      - libbz2/libbz2-1.0.8.json
-      - xrandr/xrandr-1.5.1.json
-      - libaio/libaio-0.3.112.json
-      - shared-modules/glu/glu-9.json
-      - libdecor/libdecor-0.1.0.json
+      - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json
+      - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json
+      - rd-submodules/retroarch/libaio/libaio-0.3.112.json
+      - rd-submodules/retroarch/shared-modules/glu/glu-9.json
+      - rd-submodules/retroarch/libdecor/libdecor-0.1.0.json
   - name: retroarch-filers-video
     subdir: gfx/video_filters
     make-install-args:
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
new file mode 160000
index 00000000..bcd152ba
--- /dev/null
+++ b/rd-submodules/retroarch
@@ -0,0 +1 @@
+Subproject commit bcd152baf434eea464b9e58e48078ff674c13886