diff --git a/Android.mk b/Android.mk
index 0c203c5ba..c5af19986 100755
--- a/Android.mk
+++ b/Android.mk
@@ -67,3 +67,23 @@ LOCAL_LDLIBS :=
 LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
 
 include $(BUILD_STATIC_LIBRARY)
+
+###########################
+#
+# SDL main static library
+#
+###########################
+
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+
+LOCAL_MODULE := SDL2_main
+
+LOCAL_MODULE_FILENAME := libSDL2main
+
+LOCAL_SRC_FILES := $(LOCAL_PATH)/src/main/android/SDL_android_main.c
+
+include $(BUILD_STATIC_LIBRARY)
+
+
diff --git a/build-scripts/androidbuildlibs.sh b/build-scripts/androidbuildlibs.sh
new file mode 100644
index 000000000..4a0bb2f78
--- /dev/null
+++ b/build-scripts/androidbuildlibs.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# Build the Android libraries without needing a project
+# (AndroidManifest.xml, jni/{Application,Android}.mk, etc.)
+#
+# Usage: androidbuildlibs.sh [arg for ndk-build ...]"
+#
+# Useful NDK arguments:
+#
+#  NDK_DEBUG=1          - build debug version
+#  NDK_LIBS_OUT=<dest>  - specify alternate destination for installable
+#                         modules.
+#
+# Note that SDLmain is not an installable module (.so) so libSDLmain.a
+# can be found in $obj/local/<abi> along with the unstripped libSDL.so.
+#
+
+
+# Android.mk is in srcdir
+srcdir=`dirname $0`/..
+srcdir=`cd $srcdir && pwd`
+cd $srcdir
+
+
+#
+# Create the build directories
+#
+
+build=build
+buildandroid=$build/android
+obj=
+lib=
+ndk_args=
+
+# Allow an external caller to specify locations.
+for arg in $*
+do
+  if [ "${arg:0:8}" == "NDK_OUT=" ]; then
+	obj=${arg#NDK_OUT=}
+  elif [ "${arg:0:13}" == "NDK_LIBS_OUT=" ]; then
+	lib=${arg#NDK_LIBS_OUT=}
+  else
+    ndk_args="$ndk_args $arg"
+  fi
+done
+
+if [ -z $obj ]; then
+  obj=$buildandroid/obj
+fi
+if [ -z $lib ]; then
+  lib=$buildandroid/lib
+fi
+
+for dir in $build $buildandroid $obj $lib; do
+    if test -d $dir; then
+        :
+    else
+        mkdir $dir || exit 1
+    fi
+done
+
+
+# APP_* variables set in the environment here will not be seen by the
+# ndk-build makefile segments that use them, e.g., default-application.mk.
+# For consistency, pass all values on the command line.
+ndk-build \
+  NDK_PROJECT_PATH=null \
+  NDK_OUT=$obj \
+  NDK_LIBS_OUT=$lib \
+  APP_BUILD_SCRIPT=Android.mk \
+  APP_ABI="all" \
+  APP_PLATFORM=android-12 \
+  APP_MODULES="SDL2 SDL2_main" \
+  $ndk_args