diff --git a/project/jni/boost/Android.mk b/project/jni/boost/Android.mk
index 4e4ea67b7..0a65a1a43 100644
--- a/project/jni/boost/Android.mk
+++ b/project/jni/boost/Android.mk
@@ -1,17 +1,24 @@
 LOCAL_PATH := $(call my-dir)
-BOOST_MODULE := date_time
-include $(LOCAL_PATH)/boost.mk
-BOOST_MODULE := filesystem
-include $(LOCAL_PATH)/boost.mk
-BOOST_MODULE := iostreams
-include $(LOCAL_PATH)/boost.mk
-BOOST_MODULE := program_options
-include $(LOCAL_PATH)/boost.mk
-BOOST_MODULE := regex
-include $(LOCAL_PATH)/boost.mk
-BOOST_MODULE := signals
-include $(LOCAL_PATH)/boost.mk
-BOOST_MODULE := system
-include $(LOCAL_PATH)/boost.mk
-BOOST_MODULE := thread
-include $(LOCAL_PATH)/boost.mk
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := $(notdir $(LOCAL_PATH))
+#ifeq ($(LOCAL_MODULE),boost)
+#$(error Do not use "boost" as dependency, use boost_filesystem, boost_iostreams etc)
+#endif
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+
+ifneq ($(NDK_R5_TOOLCHAIN),)
+LOCAL_SRC_FILES := lib/lib$(LOCAL_MODULE).a
+include $(PREBUILT_STATIC_LIBRARY)
+else
+LOCAL_SRC_FILES := dummy.c
+include $(BUILD_STATIC_LIBRARY)
+$(abspath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LOCAL_MODULE).a): $(LOCAL_PATH)/lib/lib$(LOCAL_MODULE).a OVERRIDE_CUSTOM_LIB
+	cp -f $< $@
+$(abspath $(LOCAL_PATH)/../../obj/local/armeabi-v7a/lib$(LOCAL_MODULE).a): $(LOCAL_PATH)/lib/lib$(LOCAL_MODULE).a OVERRIDE_CUSTOM_LIB
+	cp -f $< $@
+.PHONY: OVERRIDE_CUSTOM_LIB
+OVERRIDE_CUSTOM_LIB:
+endif
diff --git a/project/jni/boost/boost-for-android.diff b/project/jni/boost/boost-for-android.diff
deleted file mode 100644
index 2f0c69cf0..000000000
--- a/project/jni/boost/boost-for-android.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/patches/001-boost-for-android.patch b/patches/001-boost-for-android.patch
-index 6349e3d..7422ccf 100644
---- a/patches/001-boost-for-android.patch
-+++ b/patches/001-boost-for-android.patch
-@@ -167,7 +167,7 @@ index 271ceb1..0b45250 100644
-  # override this variable.
- -libraries =  ;
- +# @Moss - Adding needed libs to be valid for android
--+libraries = --with-date_time --with-filesystem --with-program_options --with-regex --with-signals --with-system --with-thread ; 
-++libraries = --with-date_time --with-filesystem --with-program_options --with-regex --with-signals --with-system --with-thread --with-iostreams ; 
-  
-  # These settings are equivivalent to corresponding command-line
-  # options.
diff --git a/project/jni/boost/boost.mk b/project/jni/boost/boost.mk
deleted file mode 100644
index d35538a67..000000000
--- a/project/jni/boost/boost.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := boost_$(BOOST_MODULE)
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-
-ifneq ($(NDK_R5_TOOLCHAIN),)
-LOCAL_SRC_FILES := lib/libboost_$(BOOST_MODULE).a
-include $(PREBUILT_STATIC_LIBRARY)
-else
-LOCAL_SRC_FILES := dummy.c
-include $(BUILD_STATIC_LIBRARY)
-$(realpath $(LOCAL_PATH)/../../obj/local/armeabi/libboost_$(BOOST_MODULE).a): $(LOCAL_PATH)/lib/libboost_$(BOOST_MODULE).a OVERRIDE_CUSTOM_LIB
-	cp -f $< $@
-$(realpath $(LOCAL_PATH)/../../obj/local/armeabi-v7a/libboost_$(BOOST_MODULE).a): $(LOCAL_PATH)/libboost_$(BOOST_MODULE).a OVERRIDE_CUSTOM_LIB
-	cp -f $< $@
-.PHONY: OVERRIDE_CUSTOM_LIB
-OVERRIDE_CUSTOM_LIB:
-endif
diff --git a/project/jni/boost/include/003-headers.patch b/project/jni/boost/include/003-headers.patch
new file mode 100644
index 000000000..3a6355ba1
--- /dev/null
+++ b/project/jni/boost/include/003-headers.patch
@@ -0,0 +1,33 @@
+diff --git a/boost/config/user.hpp b/boost/config/user.hpp
+index 5a4a9d4..cc268fe 100644
+--- a/boost/config/user.hpp
++++ b/boost/config/user.hpp
+@@ -13,6 +13,15 @@
+ //  configuration policy:
+ //
+ 
++// Android defines
++#define BOOST_THREAD_LINUX 1
++#define BOOST_HAS_PTHREADS 1
++#define __arm__ 1
++#define _REENTRANT 1
++#define _GLIBCXX__PTHREADS 1
++#define BOOST_HAS_GETTIMEOFDAY 1
++#define BOOST_HAS_UNISTD_H 1
++
+ // define this to locate a compiler config file:
+ // #define BOOST_COMPILER_CONFIG <myheader>
+ 
+diff --git a/boost/interprocess/detail/workaround.hpp b/boost/interprocess/detail/workaround.hpp
+index cb3d4a5..221967f 100644
+--- a/boost/interprocess/detail/workaround.hpp
++++ b/boost/interprocess/detail/workaround.hpp
+@@ -64,7 +64,7 @@
+    #endif
+ 
+    //Check for XSI shared memory objects. They are available in nearly all UNIX platforms
+-   #if !defined(__QNXNTO__)
++   #if !defined(__QNXNTO__) && !defined(ANDROID)
+    # define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
+    #endif
+ 
diff --git a/project/jni/boost/include/boost/config/user.hpp b/project/jni/boost/include/boost/config/user.hpp
index 5a4a9d477..cc268fec6 100644
--- a/project/jni/boost/include/boost/config/user.hpp
+++ b/project/jni/boost/include/boost/config/user.hpp
@@ -13,6 +13,15 @@
 //  configuration policy:
 //
 
+// Android defines
+#define BOOST_THREAD_LINUX 1
+#define BOOST_HAS_PTHREADS 1
+#define __arm__ 1
+#define _REENTRANT 1
+#define _GLIBCXX__PTHREADS 1
+#define BOOST_HAS_GETTIMEOFDAY 1
+#define BOOST_HAS_UNISTD_H 1
+
 // define this to locate a compiler config file:
 // #define BOOST_COMPILER_CONFIG <myheader>
 
diff --git a/project/jni/boost/include/boost/interprocess/detail/workaround.hpp b/project/jni/boost/include/boost/interprocess/detail/workaround.hpp
index cb3d4a5af..221967f8d 100644
--- a/project/jni/boost/include/boost/interprocess/detail/workaround.hpp
+++ b/project/jni/boost/include/boost/interprocess/detail/workaround.hpp
@@ -64,7 +64,7 @@
    #endif
 
    //Check for XSI shared memory objects. They are available in nearly all UNIX platforms
-   #if !defined(__QNXNTO__)
+   #if !defined(__QNXNTO__) && !defined(ANDROID)
    # define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
    #endif
 
diff --git a/project/jni/boost/lib/libboost_date_time-gcc45-mt-1_45.a b/project/jni/boost/lib/libboost_date_time-gcc45-mt-1_45.a
deleted file mode 100644
index cb9f1e24b..000000000
Binary files a/project/jni/boost/lib/libboost_date_time-gcc45-mt-1_45.a and /dev/null differ
diff --git a/project/jni/boost/lib/libboost_date_time.a b/project/jni/boost/lib/libboost_date_time.a
deleted file mode 120000
index b361c22c6..000000000
--- a/project/jni/boost/lib/libboost_date_time.a
+++ /dev/null
@@ -1 +0,0 @@
-libboost_date_time-gcc45-mt-1_45.a
\ No newline at end of file
diff --git a/project/jni/boost/lib/libboost_date_time.a b/project/jni/boost/lib/libboost_date_time.a
new file mode 100644
index 000000000..01756bbd4
Binary files /dev/null and b/project/jni/boost/lib/libboost_date_time.a differ
diff --git a/project/jni/boost/lib/libboost_filesystem-gcc45-mt-1_45.a b/project/jni/boost/lib/libboost_filesystem-gcc45-mt-1_45.a
deleted file mode 100644
index aa7571e5f..000000000
Binary files a/project/jni/boost/lib/libboost_filesystem-gcc45-mt-1_45.a and /dev/null differ
diff --git a/project/jni/boost/lib/libboost_filesystem.a b/project/jni/boost/lib/libboost_filesystem.a
deleted file mode 120000
index 78250da5e..000000000
--- a/project/jni/boost/lib/libboost_filesystem.a
+++ /dev/null
@@ -1 +0,0 @@
-libboost_filesystem-gcc45-mt-1_45.a
\ No newline at end of file
diff --git a/project/jni/boost/lib/libboost_filesystem.a b/project/jni/boost/lib/libboost_filesystem.a
new file mode 100644
index 000000000..1352ea7d1
Binary files /dev/null and b/project/jni/boost/lib/libboost_filesystem.a differ
diff --git a/project/jni/boost/lib/libboost_iostreams-gcc45-mt-1_45.a b/project/jni/boost/lib/libboost_iostreams-gcc45-mt-1_45.a
deleted file mode 100644
index 901044344..000000000
Binary files a/project/jni/boost/lib/libboost_iostreams-gcc45-mt-1_45.a and /dev/null differ
diff --git a/project/jni/boost/lib/libboost_iostreams.a b/project/jni/boost/lib/libboost_iostreams.a
deleted file mode 120000
index 20aaaf54f..000000000
--- a/project/jni/boost/lib/libboost_iostreams.a
+++ /dev/null
@@ -1 +0,0 @@
-libboost_iostreams-gcc45-mt-1_45.a
\ No newline at end of file
diff --git a/project/jni/boost/lib/libboost_iostreams.a b/project/jni/boost/lib/libboost_iostreams.a
new file mode 100644
index 000000000..3219b57ce
Binary files /dev/null and b/project/jni/boost/lib/libboost_iostreams.a differ
diff --git a/project/jni/boost/lib/libboost_program_options-gcc45-mt-1_45.a b/project/jni/boost/lib/libboost_program_options-gcc45-mt-1_45.a
deleted file mode 100644
index 37afc75c0..000000000
Binary files a/project/jni/boost/lib/libboost_program_options-gcc45-mt-1_45.a and /dev/null differ
diff --git a/project/jni/boost/lib/libboost_program_options.a b/project/jni/boost/lib/libboost_program_options.a
deleted file mode 120000
index 70c934c81..000000000
--- a/project/jni/boost/lib/libboost_program_options.a
+++ /dev/null
@@ -1 +0,0 @@
-libboost_program_options-gcc45-mt-1_45.a
\ No newline at end of file
diff --git a/project/jni/boost/lib/libboost_program_options.a b/project/jni/boost/lib/libboost_program_options.a
new file mode 100644
index 000000000..08099e832
Binary files /dev/null and b/project/jni/boost/lib/libboost_program_options.a differ
diff --git a/project/jni/boost/lib/libboost_regex-gcc45-mt-1_45.a b/project/jni/boost/lib/libboost_regex-gcc45-mt-1_45.a
deleted file mode 100644
index e6edfea46..000000000
Binary files a/project/jni/boost/lib/libboost_regex-gcc45-mt-1_45.a and /dev/null differ
diff --git a/project/jni/boost/lib/libboost_regex.a b/project/jni/boost/lib/libboost_regex.a
deleted file mode 120000
index 1dc2736ca..000000000
--- a/project/jni/boost/lib/libboost_regex.a
+++ /dev/null
@@ -1 +0,0 @@
-libboost_regex-gcc45-mt-1_45.a
\ No newline at end of file
diff --git a/project/jni/boost/lib/libboost_regex.a b/project/jni/boost/lib/libboost_regex.a
new file mode 100644
index 000000000..b95373013
Binary files /dev/null and b/project/jni/boost/lib/libboost_regex.a differ
diff --git a/project/jni/boost/lib/libboost_signals-gcc45-mt-1_45.a b/project/jni/boost/lib/libboost_signals-gcc45-mt-1_45.a
deleted file mode 100644
index b411530b2..000000000
Binary files a/project/jni/boost/lib/libboost_signals-gcc45-mt-1_45.a and /dev/null differ
diff --git a/project/jni/boost/lib/libboost_signals.a b/project/jni/boost/lib/libboost_signals.a
deleted file mode 120000
index cfd75875b..000000000
--- a/project/jni/boost/lib/libboost_signals.a
+++ /dev/null
@@ -1 +0,0 @@
-libboost_signals-gcc45-mt-1_45.a
\ No newline at end of file
diff --git a/project/jni/boost/lib/libboost_signals.a b/project/jni/boost/lib/libboost_signals.a
new file mode 100644
index 000000000..59f35e341
Binary files /dev/null and b/project/jni/boost/lib/libboost_signals.a differ
diff --git a/project/jni/boost/lib/libboost_system-gcc45-mt-1_45.a b/project/jni/boost/lib/libboost_system-gcc45-mt-1_45.a
deleted file mode 100644
index abecbf270..000000000
Binary files a/project/jni/boost/lib/libboost_system-gcc45-mt-1_45.a and /dev/null differ
diff --git a/project/jni/boost/lib/libboost_system.a b/project/jni/boost/lib/libboost_system.a
deleted file mode 120000
index af965764c..000000000
--- a/project/jni/boost/lib/libboost_system.a
+++ /dev/null
@@ -1 +0,0 @@
-libboost_system-gcc45-mt-1_45.a
\ No newline at end of file
diff --git a/project/jni/boost/lib/libboost_system.a b/project/jni/boost/lib/libboost_system.a
new file mode 100644
index 000000000..213d469ee
Binary files /dev/null and b/project/jni/boost/lib/libboost_system.a differ
diff --git a/project/jni/boost/lib/libboost_thread-gcc45-mt-1_45.a b/project/jni/boost/lib/libboost_thread-gcc45-mt-1_45.a
deleted file mode 100644
index 31bf4c8de..000000000
Binary files a/project/jni/boost/lib/libboost_thread-gcc45-mt-1_45.a and /dev/null differ
diff --git a/project/jni/boost/lib/libboost_thread.a b/project/jni/boost/lib/libboost_thread.a
deleted file mode 120000
index 465984249..000000000
--- a/project/jni/boost/lib/libboost_thread.a
+++ /dev/null
@@ -1 +0,0 @@
-libboost_thread-gcc45-mt-1_45.a
\ No newline at end of file
diff --git a/project/jni/boost/lib/libboost_thread.a b/project/jni/boost/lib/libboost_thread.a
new file mode 100644
index 000000000..9d03bb8b7
Binary files /dev/null and b/project/jni/boost/lib/libboost_thread.a differ