diff --git a/.hgignore b/.hgignore
index 87e6032..76b1025 100644
--- a/.hgignore
+++ b/.hgignore
@@ -65,6 +65,7 @@ androidTests/gradle/wrapper/gradle-wrapper.properties
 androidTests/gradlew
 androidTests/gradlew.bat
 src/org.tar.gz
+src/local.conf
 
 syntax: regexp
 android/external/[^.]*
diff --git a/README.md b/README.md
index 2e86527..aacc7b8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # p≡p JNI Adapter
+More complete developer instructions can be found here: [https://dev.pep.foundation/JNI%20Adapter/Tutorial]().
 
 ## Prerequisites
 
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 9269728..0000000
--- a/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-p≡p JNI Adapter
-===============
-
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