diff --git a/project/Build.scala b/project/Build.scala
index c7a80d6e..2b308412 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -5,8 +5,8 @@ import org.scalasbt.androidplugin._
 import org.scalasbt.androidplugin.AndroidKeys._
 
 object App {
-  val version = "1.4.6"
-  val versionCode = 28
+  val version = "1.5.1"
+  val versionCode = 29
 }
 
 object General {
diff --git a/src/main/assets/arm/ip6tables b/src/main/assets/arm/ip6tables
index 03a83b23..263de078 100755
Binary files a/src/main/assets/arm/ip6tables and b/src/main/assets/arm/ip6tables differ
diff --git a/src/main/assets/arm/iptables b/src/main/assets/arm/iptables
index c777e1e5..fdac7774 100755
Binary files a/src/main/assets/arm/iptables and b/src/main/assets/arm/iptables differ
diff --git a/src/main/assets/arm/obfsproxy b/src/main/assets/arm/obfsproxy
index 2baf63e0..f18c7eea 100755
Binary files a/src/main/assets/arm/obfsproxy and b/src/main/assets/arm/obfsproxy differ
diff --git a/src/main/assets/arm/pdnsd b/src/main/assets/arm/pdnsd
index 9b72ea9e..a6953615 100755
Binary files a/src/main/assets/arm/pdnsd and b/src/main/assets/arm/pdnsd differ
diff --git a/src/main/assets/arm/polipo b/src/main/assets/arm/polipo
index 69ed1b97..51604f06 100755
Binary files a/src/main/assets/arm/polipo and b/src/main/assets/arm/polipo differ
diff --git a/src/main/assets/arm/redsocks b/src/main/assets/arm/redsocks
index 8567cda0..12430d5c 100755
Binary files a/src/main/assets/arm/redsocks and b/src/main/assets/arm/redsocks differ
diff --git a/src/main/assets/arm/shadowsocks b/src/main/assets/arm/shadowsocks
index 3054967f..961e8f48 100755
Binary files a/src/main/assets/arm/shadowsocks and b/src/main/assets/arm/shadowsocks differ
diff --git a/src/main/assets/x86/ip6tables b/src/main/assets/x86/ip6tables
index 16a0802b..de8acddd 100755
Binary files a/src/main/assets/x86/ip6tables and b/src/main/assets/x86/ip6tables differ
diff --git a/src/main/assets/x86/iptables b/src/main/assets/x86/iptables
index a146f450..61e46ede 100755
Binary files a/src/main/assets/x86/iptables and b/src/main/assets/x86/iptables differ
diff --git a/src/main/assets/x86/obfsproxy b/src/main/assets/x86/obfsproxy
index 46a608d5..324881d1 100755
Binary files a/src/main/assets/x86/obfsproxy and b/src/main/assets/x86/obfsproxy differ
diff --git a/src/main/assets/x86/pdnsd b/src/main/assets/x86/pdnsd
index 53cb2501..75f12c12 100755
Binary files a/src/main/assets/x86/pdnsd and b/src/main/assets/x86/pdnsd differ
diff --git a/src/main/assets/x86/polipo b/src/main/assets/x86/polipo
index 3d7b489b..dac0a56c 100755
Binary files a/src/main/assets/x86/polipo and b/src/main/assets/x86/polipo differ
diff --git a/src/main/assets/x86/redsocks b/src/main/assets/x86/redsocks
index db11c17d..8c64e0c1 100755
Binary files a/src/main/assets/x86/redsocks and b/src/main/assets/x86/redsocks differ
diff --git a/src/main/assets/x86/shadowsocks b/src/main/assets/x86/shadowsocks
index 8f732418..c18c9962 100755
Binary files a/src/main/assets/x86/shadowsocks and b/src/main/assets/x86/shadowsocks differ
diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
index 5d7bdf0f..b02bd403 100755
--- a/src/main/jni/Android.mk
+++ b/src/main/jni/Android.mk
@@ -130,13 +130,15 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
-SHADOWSOCKS_SOURCES := local.c encrypt.c rc4.c md5.c utils.c json.c jconf.c
+SHADOWSOCKS_SOURCES := local.c encrypt.c utils.c json.c jconf.c
 
 LOCAL_MODULE    := shadowsocks 
 LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -I$(LOCAL_PATH)/libev/ -DHAVE_CONFIG_H -DANDROID
+LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DANDROID -DHAVE_CONFIG_H \
+	-I$(LOCAL_PATH)/libev/ \
+	-I$(LOCAL_PATH)/openssl/include 
 
-LOCAL_STATIC_LIBRARIES := libev
+LOCAL_STATIC_LIBRARIES := libev libcrypto
 
 LOCAL_LDLIBS := -llog
 
diff --git a/src/main/jni/shadowsocks b/src/main/jni/shadowsocks
index e5c94e7c..4ea69468 160000
--- a/src/main/jni/shadowsocks
+++ b/src/main/jni/shadowsocks
@@ -1 +1 @@
-Subproject commit e5c94e7c20f1f3f019a717e2e6f4389b94ff7d53
+Subproject commit 4ea69468b4e677d89e2d27a3f497e825875419ae
diff --git a/src/main/libs/armeabi/libexec.so b/src/main/libs/armeabi/libexec.so
index 4832c023..ab5c9c64 100755
Binary files a/src/main/libs/armeabi/libexec.so and b/src/main/libs/armeabi/libexec.so differ
diff --git a/src/main/libs/armeabi/libsystem.so b/src/main/libs/armeabi/libsystem.so
index 7eb3332c..a1fff005 100755
Binary files a/src/main/libs/armeabi/libsystem.so and b/src/main/libs/armeabi/libsystem.so differ
diff --git a/src/main/libs/x86/libexec.so b/src/main/libs/x86/libexec.so
index d42b3403..c4bf130c 100755
Binary files a/src/main/libs/x86/libexec.so and b/src/main/libs/x86/libexec.so differ
diff --git a/src/main/libs/x86/libsystem.so b/src/main/libs/x86/libsystem.so
index 2e80f2bf..07359615 100755
Binary files a/src/main/libs/x86/libsystem.so and b/src/main/libs/x86/libsystem.so differ
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6e27a63a..b548b121 100755
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -20,12 +20,24 @@
   <string name="sitekey_summary">Password of your Shadowsocks server</string>
   <string name="enc_method">Encrypt Method</string>
   <array name="enc_method_entry">
-    <item>Table</item>
+    <item>TABLE</item>
     <item>RC4</item>
+    <item>AES-128-CFB</item>
+    <item>AES-192-CFB</item>
+    <item>AES-256-CFB</item>
+    <item>BF-CFB</item>
+    <item>CAST5-CFB</item>
+    <item>DES-CFB</item>
   </array>
   <array name="enc_method_value">
     <item>table</item>
     <item>rc4</item>
+    <item>aes-128-cfba</item>
+    <item>aes-192-cfba</item>
+    <item>aes-256-cfbb</item>
+    <item>bf-cfbc</item>
+    <item>cast5-cfb</item>
+    <item>des-cfb</item>
   </array>
 
   <!-- feature category -->