diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..7c3be65b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "jni/shadowsocks"]
+	path = jni/shadowsocks
+	url = https://github.com/madeye/shadowsocks-libev.git
diff --git a/assets/arm/shadowsocks b/assets/arm/shadowsocks
index 1b39f135..3cab1b84 100755
Binary files a/assets/arm/shadowsocks and b/assets/arm/shadowsocks differ
diff --git a/assets/x86/shadowsocks b/assets/x86/shadowsocks
index a2e14756..e2e6287f 100755
Binary files a/assets/x86/shadowsocks and b/assets/x86/shadowsocks differ
diff --git a/jni/Android.mk b/jni/Android.mk
index 86bf243f..18a78daf 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -110,9 +110,11 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
+SHADOWSOCKS_SOURCES := local.c encrypt.c rc4.c md5.c utils.c json.c jconf.c
+
 LOCAL_MODULE    := shadowsocks 
-LOCAL_SRC_FILES := shadowsocks/local.c shadowsocks/encrypt.c shadowsocks/rc4.c shadowsocks/md5.c
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -I$(LOCAL_PATH)/libev/
+LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
+LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -I$(LOCAL_PATH)/libev/ -DHAVE_CONFIG_H -DANDROID
 
 LOCAL_STATIC_LIBRARIES := libev
 
diff --git a/jni/shadowsocks b/jni/shadowsocks
new file mode 160000
index 00000000..3ed7551c
--- /dev/null
+++ b/jni/shadowsocks
@@ -0,0 +1 @@
+Subproject commit 3ed7551ce18147740ad1e1113d9d4ca2c01e4248