diff --git a/examples/android/jni/Application.mk b/examples/android/jni/Application.mk
index 385dd64dc..360d526a8 100644
--- a/examples/android/jni/Application.mk
+++ b/examples/android/jni/Application.mk
@@ -1,4 +1,5 @@
+NDK_TOOLCHAIN_VERSION := 4.8
 APP_PLATFORM := android-17
-APP_STL := stlport_shared
-APP_ABI := armeabi-v7a
+APP_STL := c++_shared
+APP_ABI := all
 APP_MODULES := sfml-activity sfml-example
diff --git a/extlibs/libs-android/armeabi-v7a/libfreetype.a b/extlibs/libs-android/armeabi-v7a/libfreetype.a
index 80b51d471..844b4ff44 100644
Binary files a/extlibs/libs-android/armeabi-v7a/libfreetype.a and b/extlibs/libs-android/armeabi-v7a/libfreetype.a differ
diff --git a/extlibs/libs-android/armeabi-v7a/libjpeg.a b/extlibs/libs-android/armeabi-v7a/libjpeg.a
index 88c770f04..415b07f29 100644
Binary files a/extlibs/libs-android/armeabi-v7a/libjpeg.a and b/extlibs/libs-android/armeabi-v7a/libjpeg.a differ
diff --git a/extlibs/libs-android/armeabi-v7a/libopenal.so b/extlibs/libs-android/armeabi-v7a/libopenal.so
index e65a88058..74c33b600 100755
Binary files a/extlibs/libs-android/armeabi-v7a/libopenal.so and b/extlibs/libs-android/armeabi-v7a/libopenal.so differ
diff --git a/extlibs/libs-android/armeabi-v7a/libsndfile.so b/extlibs/libs-android/armeabi-v7a/libsndfile.so
index e99805c5f..6a7c201bf 100755
Binary files a/extlibs/libs-android/armeabi-v7a/libsndfile.so and b/extlibs/libs-android/armeabi-v7a/libsndfile.so differ
diff --git a/extlibs/libs-android/armeabi/libfreetype.a b/extlibs/libs-android/armeabi/libfreetype.a
index 66966341b..e3f80b788 100644
Binary files a/extlibs/libs-android/armeabi/libfreetype.a and b/extlibs/libs-android/armeabi/libfreetype.a differ
diff --git a/extlibs/libs-android/armeabi/libjpeg.a b/extlibs/libs-android/armeabi/libjpeg.a
index 1e535bce8..ac2a3c432 100644
Binary files a/extlibs/libs-android/armeabi/libjpeg.a and b/extlibs/libs-android/armeabi/libjpeg.a differ
diff --git a/extlibs/libs-android/armeabi/libopenal.so b/extlibs/libs-android/armeabi/libopenal.so
index 37af93d2e..e0e1a7f06 100755
Binary files a/extlibs/libs-android/armeabi/libopenal.so and b/extlibs/libs-android/armeabi/libopenal.so differ
diff --git a/extlibs/libs-android/armeabi/libsndfile.so b/extlibs/libs-android/armeabi/libsndfile.so
index 4407050e3..317c4e75a 100755
Binary files a/extlibs/libs-android/armeabi/libsndfile.so and b/extlibs/libs-android/armeabi/libsndfile.so differ
diff --git a/extlibs/libs-android/mips/libfreetype.a b/extlibs/libs-android/mips/libfreetype.a
index a0161ee6d..0d06835a3 100644
Binary files a/extlibs/libs-android/mips/libfreetype.a and b/extlibs/libs-android/mips/libfreetype.a differ
diff --git a/extlibs/libs-android/mips/libjpeg.a b/extlibs/libs-android/mips/libjpeg.a
index 1d1ae0ab0..406cafc10 100644
Binary files a/extlibs/libs-android/mips/libjpeg.a and b/extlibs/libs-android/mips/libjpeg.a differ
diff --git a/extlibs/libs-android/mips/libopenal.so b/extlibs/libs-android/mips/libopenal.so
index bbb6f8eb1..4177dae74 100755
Binary files a/extlibs/libs-android/mips/libopenal.so and b/extlibs/libs-android/mips/libopenal.so differ
diff --git a/extlibs/libs-android/mips/libsndfile.so b/extlibs/libs-android/mips/libsndfile.so
index 6ef056517..bce33a2de 100755
Binary files a/extlibs/libs-android/mips/libsndfile.so and b/extlibs/libs-android/mips/libsndfile.so differ
diff --git a/extlibs/libs-android/x86/libfreetype.a b/extlibs/libs-android/x86/libfreetype.a
index 831405427..45abac71e 100644
Binary files a/extlibs/libs-android/x86/libfreetype.a and b/extlibs/libs-android/x86/libfreetype.a differ
diff --git a/extlibs/libs-android/x86/libjpeg.a b/extlibs/libs-android/x86/libjpeg.a
index ce11c5087..a38731b21 100644
Binary files a/extlibs/libs-android/x86/libjpeg.a and b/extlibs/libs-android/x86/libjpeg.a differ
diff --git a/extlibs/libs-android/x86/libopenal.so b/extlibs/libs-android/x86/libopenal.so
index 389fcff53..c790748cd 100755
Binary files a/extlibs/libs-android/x86/libopenal.so and b/extlibs/libs-android/x86/libopenal.so differ
diff --git a/extlibs/libs-android/x86/libsndfile.so b/extlibs/libs-android/x86/libsndfile.so
index 1d953474a..18abb9386 100755
Binary files a/extlibs/libs-android/x86/libsndfile.so and b/extlibs/libs-android/x86/libsndfile.so differ
diff --git a/src/SFML/Main/SFMLActivity.cpp b/src/SFML/Main/SFMLActivity.cpp
index ce3f8ac5d..8d746bd9b 100644
--- a/src/SFML/Main/SFMLActivity.cpp
+++ b/src/SFML/Main/SFMLActivity.cpp
@@ -171,7 +171,7 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
     jobject ObjectActivityInfo = lJNIEnv->CallObjectMethod(ObjectPackageManager, MethodGetActivityInfo, ObjectComponentName, (jint)128);
 
     // Load our libraries in reverse order
-    loadLibrary("stlport_shared", lJNIEnv, ObjectActivityInfo);
+    loadLibrary("c++_shared", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-system", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-window", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-graphics", lJNIEnv, ObjectActivityInfo);
diff --git a/src/SFML/Window/Android/WindowImplAndroid.cpp b/src/SFML/Window/Android/WindowImplAndroid.cpp
index 19cf600ea..f47252825 100644
--- a/src/SFML/Window/Android/WindowImplAndroid.cpp
+++ b/src/SFML/Window/Android/WindowImplAndroid.cpp
@@ -51,7 +51,7 @@ WindowImplAndroid::WindowImplAndroid(WindowHandle handle)
 
 
 ////////////////////////////////////////////////////////////
-WindowImplAndroid::WindowImplAndroid(VideoMode mode, const std::string& title, unsigned long style, const ContextSettings& settings)
+WindowImplAndroid::WindowImplAndroid(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings)
 {
     ActivityStates* states = getActivity(NULL);
     Lock lock(states->mutex);
diff --git a/src/SFML/Window/Android/WindowImplAndroid.hpp b/src/SFML/Window/Android/WindowImplAndroid.hpp
index 290f8c5eb..d1249a2ed 100644
--- a/src/SFML/Window/Android/WindowImplAndroid.hpp
+++ b/src/SFML/Window/Android/WindowImplAndroid.hpp
@@ -64,7 +64,7 @@ public :
     /// \param settings Additional settings for the underlying OpenGL context
     ///
     ////////////////////////////////////////////////////////////
-    WindowImplAndroid(VideoMode mode, const std::string& title, unsigned long style, const ContextSettings& settings);
+    WindowImplAndroid(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings);
 
     ////////////////////////////////////////////////////////////
     /// \brief Destructor