diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index bad76b9..94a658e 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -59,7 +59,7 @@ LOCAL_MODULE     := pEpJNI
 LOCAL_SHARED_LIBRARIES := libgpgme libassuan libcurl libgcrypt libgpg-error
 LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid
 LOCAL_CPP_FEATURES += exceptions
-LOCAL_CFLAGS += -DHAVE_PTHREADS
+LOCAL_CFLAGS += -DHAVE_PTHREADS -DANDROID_STL=c++_shared
 LOCAL_SRC_FILES  := \
 		  ../../src/org_pEp_jniadapter_AbstractEngine.cc \
 		  ../../src/org_pEp_jniadapter_Engine.cc \
@@ -75,6 +75,7 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE     := pEpJNIAndroidHelper
 LOCAL_SHARED_LIBRARIES := libgpgme
+LOCAL_CFLAGS += -DANDROID_STL=c++_shared
 LOCAL_SRC_FILES  := org_pEp_jniadapter_AndroidHelper.cc
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 2740c89..0e7d1e7 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_STL := c++_static
+APP_STL := c++_shared
 APP_OPTIM := debug
 APP_PLATFORM=android-18
 APP_ABI := armeabi-v7a