diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 4b9e52be..a3ebe703 100644
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -430,6 +430,21 @@ build_libretro_scenewalker()
    fi
 }
 
+build_libretro_instancingviewer()
+{
+   cd "$BASE_DIR"
+   if [ -d "libretro-gl-instancingviewer" ]; then
+      echo "=== Building Instancing Viewer (GL) ==="
+      check_opengl
+      cd libretro-gl-instancingviewer
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS clean || die "Failed to clean InstancingViewer"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS || die "Failed to build InstancingViewer"
+      cp instancingviewer_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
+   else
+      echo "InstancingViewer not fetched, skipping ..."
+   fi
+}
+
 build_libretro_scummvm()
 {
    cd "$BASE_DIR"
diff --git a/libretro-build.sh b/libretro-build.sh
index 2f56863d..a3d6fd3d 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -170,6 +170,7 @@ else
 if [ -z $BUILD_LIBRETRO_GL ]; then
    build_libretro_modelviewer
    build_libretro_scenewalker
+   build_libretro_instancingviewer
 if [ -z $BUILD_EXPERIMENTAL ]; then
    build_libretro_mupen64
    build_libretro_ffmpeg
@@ -198,8 +199,6 @@ fi
    build_libretro_mame078
    build_libretro_dosbox
    build_libretro_scummvm
-   build_libretro_modelviewer
-   build_libretro_scenewalker
    build_libretro_picodrive
 if [ $FORMAT_COMPILER_TARGET != "win" ]; then
    build_libretro_desmume