diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 6b7c9268..0f5ffa2a 100644
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -14,6 +14,24 @@ fi
 
 echo "Compiler: $COMPILER"
 
+platformvar=armv
+
+if [ "$ARM_NEON"= true]; then
+platformvar += -neon
+fi
+if [ "$CORTEX_A8"= true]; then
+platformvar += -cortexa8
+fi
+if [ "$CORTEX_A9"= true]; then
+platformvar += -cortexa9
+fi
+if [ "$ARM_HARDFLOAT"= true]; then
+platformvar += -cortexa9
+fi
+if [ "$ARM_SOFTFLOAT"= true]; then
+platformvar += -softfloat
+fi
+
 build_libretro_fba_full()
 {
    cd "$BASE_DIR"
@@ -484,9 +502,9 @@ build_libretro_picodrive()
       echo "=== Building Picodrive ==="
       cd libretro-picodrive
       if [ "$ARMV7" = true ]; then
-         echo "=== Building PCSX ReARMed (ARMV7 NEON) ==="
-         ${MAKE} -f Makefile.libretro platform=arm -j$JOBS clean || die "Failed to clean Picodrive"
-         ${MAKE} -f Makefile.libretro platform=arm -j$JOBS || die "Failed to build Picodrive"
+         echo "=== Building Picodrive (ARMv7) ==="
+         ${MAKE} -f Makefile.libretro platform=$platformvar -j$JOBS clean || die "Failed to clean Picodrive"
+         ${MAKE} -f Makefile.libretro platform=$platformvar -j$JOBS || die "Failed to build Picodrive"
       else
          ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS clean || die "Failed to clean Picodrive"
          ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS || die "Failed to build PCSX Picodrive"
diff --git a/libretro-config.sh b/libretro-config.sh
index 14be975c..ee0c54ad 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 
+#USER DEFINES
+#------------
+#These options should be defined inside your own
+#local libretro-config-user.sh file rather than here.
+#The following below is just a sample.
+
 if [ -f "libretro-config-user.sh" ]; then
-# All your user defines (listed below) should go in this local file
 . ./libretro-config-user.sh
 fi
 
-#User defines (should be defined in local libretro-config-user.sh file)
-
 #if uncommented, will fetch repos with read+write access. Useful for committers
 #export WRITERIGHTS
 
@@ -15,3 +18,21 @@ fi
 
 #if uncommented, will build experimental cores as well which are not yet fit for release.
 #export BUILD_EXPERIMENTAL
+
+#ARM DEFINES
+#-----------
+
+#if uncommented, will build cores with Cortex A8 compiler optimizations
+#export CORTEX_A8
+
+#if uncommented, will build cores with Cortex A9 compiler optimizations
+#export CORTEX_A9
+
+#if uncommented, will build cores with ARM hardfloat ABI
+#export ARM_HARDFLOAT
+
+#if uncommented, will build cores with ARM softfloat ABI
+#export ARM_SOFTFLOAT
+
+#if uncommented, will build cores with ARM NEON support (ARMv7+ only)
+#export ARM_NEON