diff --git a/jni/Application.mk b/jni/Application.mk
index 14aa1b7846e19317a116a671797600cf8b196c47..d45ad7a819d32522f17ed61f5b2a4cf380aef758 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,41 +1,39 @@
 APP_OPTIM := release
 
-APP_MODULES := libccgnu2
-APP_MODULES += libyaml
-APP_MODULES += libsamplerate
+#APP_MODULES := libccgnu2
+#APP_MODULES += libyaml
+#APP_MODULES += libsamplerate
 #APP_MODULES += libexpat_static
-APP_MODULES += libexpat_shared
-APP_MODULES += libccrtp1
-#APP_MODULES += libcutils-static
-#APP_MODULES += libcutils-shared
-APP_MODULES += libdbus
-APP_MODULES += libdbus-tools-common
+#APP_MODULES += libexpat_shared
+#APP_MODULES += libccrtp1
+#APP_MODULES += libdbus
+#APP_MODULES += libdbus-tools-common
 APP_MODULES += dbus-daemon
 APP_MODULES += dbus-monitor
 APP_MODULES += dbus-send
 
-APP_MODULES += libdbus-c++-1
-APP_MODULES += libdbus-glue
-APP_MODULES += libsiplink
-APP_MODULES += libconfig
+#APP_MODULES += libdbus-c++-1
+#APP_MODULES += libdbus-glue
+#APP_MODULES += libsiplink
+#APP_MODULES += libconfig
 
 #APP_MODULES += libcrypto
 #APP_MODULES += libssl
 #APP_MODULES += openssl
 
-APP_MODULES += libspeex
-APP_MODULES += libspeexresampler
-APP_MODULES += libopensl
-APP_MODULES += libsound
-APP_MODULES += libulaw
-APP_MODULES += libalaw
-APP_MODULES += libcodecfactory
-APP_MODULES += librtp
-APP_MODULES += libaudio
-APP_MODULES += libhistory
-APP_MODULES += libhooks
+#APP_MODULES += libspeex
+#APP_MODULES += libspeexresampler
+#APP_MODULES += libopensl
+#APP_MODULES += libsound
+#APP_MODULES += libulaw
+#APP_MODULES += libalaw
+#APP_MODULES += libcodecfactory
+#APP_MODULES += librtp
+#APP_MODULES += libaudio
+#APP_MODULES += libhistory
+#APP_MODULES += libhooks
 
-APP_MODULES += libsflphone
+#APP_MODULES += libsflphone
 APP_MODULES += sflphoned
 
 APP_STL := gnustl_shared
diff --git a/jni/ccrtp-1.8.0-android/src/Android.mk b/jni/ccrtp-1.8.0-android/src/Android.mk
index 3ea3555b18e6b91ea99f1234f73b9df8ce35d89d..3e7e093e38df0073600986313c4b6b8c1be2054f 100644
--- a/jni/ccrtp-1.8.0-android/src/Android.mk
+++ b/jni/ccrtp-1.8.0-android/src/Android.mk
@@ -17,7 +17,8 @@ LOCAL_CPPFLAGS   += -std=gnu++0x -fexceptions
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../commoncpp2-1.8.1-android/inc \
 		    $(LOCAL_PATH)/../../openssl/include
 LOCAL_MODULE     := libccrtp1
-LOCAL_SHARED_LIBRARIES := libccgnu2
+LOCAL_SHARED_LIBRARIES += libccgnu2 \
+						  libssl_shared
 LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib \
                     -L$(APP_PROJECT_PATH)/obj/local/armeabi \
                     -lccgnu2 \
diff --git a/jni/dbus/bus/Android.mk b/jni/dbus/bus/Android.mk
index 30569ab88182283d71ae3222826d9e782a1a912a..ed229245c0e8f6ffc23d801ed821200cf0b503e6 100644
--- a/jni/dbus/bus/Android.mk
+++ b/jni/dbus/bus/Android.mk
@@ -6,7 +6,7 @@ LOCAL_C_INCLUDES:= \
 	$(call include-path-for, dbus) \
 	$(call include-path-for, dbus)/dbus \
 	$(LOCAL_PATH)/.. \
-	$(LOCAL_PATH)/../../libexpat \
+	$(LOCAL_PATH)/../../libexpat
 
 LOCAL_CFLAGS:=-O3
 LOCAL_CFLAGS+=-DDBUS_COMPILATION
@@ -42,7 +42,7 @@ LOCAL_SRC_FILES:= \
 	utils.c
 
 LOCAL_SHARED_LIBRARIES := \
-	libexpat \
+	libexpat_shared \
 	libdbus
 
 LOCAL_MODULE:=dbus-daemon
diff --git a/jni/openssl/ssl/Android.mk b/jni/openssl/ssl/Android.mk
index e0c7b4913fcd0e6217a6fe466244b86561f21f09..9a1efb07c167298e4b7e61dab18c9d3f72b1fdf2 100644
--- a/jni/openssl/ssl/Android.mk
+++ b/jni/openssl/ssl/Android.mk
@@ -75,7 +75,8 @@ LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_C_INCLUDES += $(local_c_includes)
 LOCAL_SHARED_LIBRARIES += libcrypto
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl
+LOCAL_MODULE:= libssl_shared
+LOCAL_MODULE_FILENAME := libssl
 include $(BUILD_SHARED_LIBRARY)
 
 #######################################
diff --git a/jni/sflphone b/jni/sflphone
index 8fcfc96b11b0f51d7b498173962ef3d4f485657d..6c425f4034400e738195d3e7019883af6bb8e319 160000
--- a/jni/sflphone
+++ b/jni/sflphone
@@ -1 +1 @@
-Subproject commit 8fcfc96b11b0f51d7b498173962ef3d4f485657d
+Subproject commit 6c425f4034400e738195d3e7019883af6bb8e319