diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
new file mode 100644
index 0000000..4bf9b55
--- /dev/null
+++ b/build-android/jni/Android.mk
@@ -0,0 +1,31 @@
+# Copyleft 2018 pEp foundation
+#
+# This file is under GNU General Public License 3.0
+# see LICENSE.txt
+ 
+LOCAL_PATH := $(call my-dir)
+
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := pEpCxx11
+
+
+LOCAL_CPP_FEATURES += exceptions
+LOCAL_CPPFLAGS += -std=c++14 -DANDROID_STL=c++_shared -frtti
+
+#FIXME: WORKARROUND 
+STUB = $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)/../../../pEpEngine/ $(LOCAL_PATH)/../../)
+$(info $(STUB))
+
+LIB_PEP_ADAPTER_INCLUDE_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.h*)
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../pEpEngine/build-android/include \
+            $(LIB_PEP_ADAPTER_INCLUDE_FILES:%=%)
+
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include
+
+LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/../../src/*.cc)
+
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/build-android/jni/Application.mk b/build-android/jni/Application.mk
new file mode 100644
index 0000000..85c6eb6
--- /dev/null
+++ b/build-android/jni/Application.mk
@@ -0,0 +1,5 @@
+APP_STL := c++_shared
+APP_OPTIM := debug
+APP_PLATFORM=android-18
+APP_ABI := armeabi-v7a
+NDK_TOOLCHAIN_VERSION = clang
diff --git a/build-android/takeOutHeaderFiles.sh b/build-android/takeOutHeaderFiles.sh
new file mode 100755
index 0000000..427a589
--- /dev/null
+++ b/build-android/takeOutHeaderFiles.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "Install script"
+set -e
+engine_dir="$1"
+
+mkdir -p "$engine_dir/build-android/include/pEp"
+cp "$2"/src/*.h* "$engine_dir/build-android/include/pEp"