diff --git a/packages/games/emulators/retroarch/package.mk b/packages/games/emulators/retroarch/package.mk
index 2534302ad..1df2edb92 100644
--- a/packages/games/emulators/retroarch/package.mk
+++ b/packages/games/emulators/retroarch/package.mk
@@ -29,18 +29,28 @@ pre_configure_target() {
 				--enable-sdl2 \
 				--enable-ffmpeg"
 
-  if [ "${ARCH}" == "arm" ] || [ "${ARCH}" == "aarch64" ]
-  then
-    PKG_DEPENDS_TARGET+=" librga ${OPENGLES}"
-    PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengles --enable-opengles3 --enable-opengles3_2 --enable-kms --disable-mali_fbdev --enable-odroidgo2"
-  else
-    PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd vulkan-loader vulkan-headers"
-    PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengl --enable-vulkan --enable-vulkan_display"
-  fi
+  case ${ARCH} in
+    arm)
+      PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
+      PKG_DEPENDS_TARGET+=" librga ${OPENGLES}"
+      PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengles --enable-opengles3 --enable-opengles3_2 --enable-kms --disable-mali_fbdev"
+    ;;
+    aarch64)
+      PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
+      PKG_DEPENDS_TARGET+=" librga ${OPENGLES}"
+      PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengles --enable-opengles3 --enable-opengles3_2 --enable-kms --disable-mali_fbdev"
+    ;;
+    *)
+      PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd vulkan-loader vulkan-headers"
+      PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengl --enable-vulkan --enable-vulkan_display"
+  esac
 
-  if [ "${ARCH}" == "arm" ]; then
-    PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
-  fi
+  case ${DEVICE} in
+    RG351P)
+      PKG_DEPENDS_TARGET+=" libgo2"
+      PKG_CONFIGURE_OPTS_TARGET+=" --enable-odroidgo2"
+    ;;
+  esac
 
   cd ${PKG_BUILD}
 }
diff --git a/scripts/build_distro b/scripts/build_distro
index 964924260..24ba14e03 100755
--- a/scripts/build_distro
+++ b/scripts/build_distro
@@ -38,6 +38,12 @@ then
     ln -sf build.${DISTRO}-${ROOT}.${ARCH} build.${DISTRO}-${DEVICE}.${ARCH}
   fi
 
+  # Clean packages that have device specific configurations.
+  PKG_CLEAN="${PKG_CLEAN} mupen64plus-nx mupen64plus flycast_libretro dosbox-pure parallel-n64_glide64 \
+             parallel-n64_gln64 parallel-n64_rice pcsx_rearmed pcsx_rearmed gpsp raze amiberry lzdoom  \
+             PPSSPPSDL gzdoom mupen64plussa-core mupen64plussa-input-sdl 351files libgo2 \
+             gamecontrollerdb"
+
   # Clean additional packages to ensure the OS is properly built for this device
   PKG_CLEAN="${PKG_CLEAN} plymouth-lite initramfs busybox kernel grub u-boot SDL2"
 fi