diff --git a/metadata/org.retroarch.txt b/metadata/org.retroarch.txt
index 23b4a7d3af..69318c7910 100644
--- a/metadata/org.retroarch.txt
+++ b/metadata/org.retroarch.txt
@@ -19,7 +19,7 @@ devices, without writing any platform-specific code.
 Latest F-Droid build supports following systems:
 
 * Play Station 1 with PCSX ReARMed core (ARMv7 only)
-* Super Nintendo with bSNES core (ARMv7 and x86 only)
+#* Super Nintendo with bSNES core (ARMv7 and x86 only)
 
 Anti-features: Addons. This build does not include non-free components, but majority of cores, 
 included in official .apk, have non-free licenses or contain proprietary parts.
@@ -36,15 +36,22 @@ Repo:git://github.com/libretro/RetroArch.git
 
 Build Version:0.9.9.6,22,!fails on ndk r9 7d25e64fb446af37ccc50693e5662d8d48b655e5,target=android-17,\
 subdir=android/phoenix,buildjni=no,srclibs=pcsx_rearmed@c6c27ccd79;bSNES@2b89497415,\
-prebuild=cp -R ../../media/overlays/ assets/,build=\
+prebuild=cp -R ../../media/overlays/ assets/,\
+init=sed 's/\$(SRCDIR)/..\/../' -i $$bSNES$$/target-libretro/jni/Android.mk,\
+build=\
   $$NDK$$/ndk-build -C ../native && mv ../native/libs/ . && \
   $$NDK$$/ndk-build -C $$pcsx_rearmed$$ APP_ABI=armeabi-v7a && \
   mv $$pcsx_rearmed$$/libs/armeabi-v7a/libretro.so libs/armeabi-v7a/libretro_pcsx_rearmed-neon.so && \
   $$NDK$$/ndk-build -C $$pcsx_rearmed$$ clean APP_ABI=armeabi-v7a && \
   $$NDK$$/ndk-build -C $$pcsx_rearmed$$ NO_NEON=1 APP_ABI=armeabi-v7a && \
-  mv $$pcsx_rearmed$$/libs/armeabi-v7a/libretro-noneon.so libs/armeabi-v7a/libretro_pcsx_rearmed.so && \
-  $$NDK$$/ndk-build -C $$bSNES$$/target-libretro/ APP_ABI="armeabi-v7a x86" && \
-  mv $$bSNES$$/target-libretro/libs/ .
+  mv $$pcsx_rearmed$$/libs/armeabi-v7a/libretro-noneon.so libs/armeabi-v7a/libretro_pcsx_rearmed.so
+
+# TODO: Enable bSNES core, when server receives NDK r9 (it requires C11 features, which - 
+# according to my testing - aren't present in GCC 4.6 - according to my testing - and explicitely 
+# demands GCC 4.8 in Application.mk)
+#
+#  $$NDK$$/ndk-build -C $$bSNES$$/target-libretro/ APP_ABI="armeabi-v7a x86" && \
+#  mv $$bSNES$$/target-libretro/libs/ .
 
 Auto Update Mode:None
 # See http://forum.xda-developers.com/showthread.php?t=2116468 for exact release dates