diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 35b1bffd..48e41caa 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -333,6 +333,23 @@ build_libretro_modelviewer()
    fi
 }
 
+build_libretro_instancingviewer()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-gl-instancingviewer" ]; then
+      echo "=== Building InstancingViewer (GL) ==="
+      cd libretro-gl-instancingviewer
+      cd jni
+      ndk-build clean APP_ABI="armeabi-v7a mips x86"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86"
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_instancingviewer.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_instancingviewer.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_instancingviewer.${FORMAT_EXT}
+   else
+      echo "InstancingViewer not fetched, skipping ..."
+   fi
+}
+
 build_libretro_scenewalker()
 {
    cd $BASE_DIR
@@ -456,6 +473,7 @@ else
    build_libretro_nestopia
    build_libretro_tyrquake
    build_libretro_modelviewer
+   build_libretro_instancingviewer
    build_libretro_scenewalker
    build_libretro_picodrive
 fi
diff --git a/libretro-config.sh b/libretro-config.sh
index 4c28a62c..92483eb6 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -3,7 +3,9 @@
 # Architecture Assignment
 ARCH="$(uname -m)"
 case "$ARCH" in
-   x86_64) X86=true && X86_64=true;;
+   x86_64)
+      X86=true && X86_64=true
+      ;;
    i686)   X86=true;;
    armv*)
       ARM=true && export FORMAT_COMPILER_TARGET=armv
@@ -77,7 +79,8 @@ fi
 #export BUILD_EXPERIMENTAL=1
 
 #ARM DEFINES
-#-----------
+#===========
+
 #if uncommented, will build cores with Cortex A8 compiler optimizations
 #export CORTEX_A8=1
 
@@ -94,7 +97,7 @@ fi
 #export ARM_NEON=1
 
 #OPENGL DEFINES
-#--------------
+#==============
 
 #if uncommented, will build libretro GL cores. Ignored for mobile platforms - GL cores will always be built there.
 #export BUILD_LIBRETRO_GL=1
@@ -102,3 +105,15 @@ fi
 #if uncommented, will build cores with OpenGL ES 2 support. Not needed
 #for platform-specific cores - only for generic core builds (ie. libretro-build.sh)
 #export ENABLE_GLES=1
+
+#ANDROID DEFINES
+#================
+
+#uncomment to define NDK standalone toolchain for ARM
+#export NDK_ROOT_DIR_ARM = 
+
+#uncomment to define NDK standalone toolchain for MIPS
+#export NDK_ROOT_DIR_MIPS = 
+
+#uncomment to define NDK standalone toolchain for x86
+#export NDK_ROOT_DIR_X86 =