diff --git a/.gitignore b/.gitignore
index ecec4bea..87b1bdf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ local.sbt
 
 mobile/src/main/libs
 mobile/src/main/obj
+mobile/src/main/jni/overture
diff --git a/.gitmodules b/.gitmodules
index d74fc99e..8dafbfc2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,3 +33,6 @@
 [submodule "mobile/src/main/jni/libudns"]
 	path = mobile/src/main/jni/libudns
 	url = https://github.com/shadowsocks/libudns.git
+[submodule "mobile/src/overture"]
+	path = mobile/src/overture
+	url = https://github.com/shadowsocks/overture-android.git
diff --git a/.travis.yml b/.travis.yml
index 62338c27..84fd6721 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ env:
     global:
         - NDK_VERSION=r12b
         - NDK_CCACHE=ccache
+        - GOROOT_BOOTSTRAP=$GOROOT
         - ANDROID_NDK_HOME=$HOME/.android/android-ndk-${NDK_VERSION}
         - SBTPATH=$HOME/.sbt
         - PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
@@ -49,4 +50,4 @@ install:
       fi
 
 script:
-    - $SBTPATH/sbt android:package
+    - $SBTPATH/sbt go-build android:package
diff --git a/mobile/build.sbt b/mobile/build.sbt
index c593cb68..12e8420c 100644
--- a/mobile/build.sbt
+++ b/mobile/build.sbt
@@ -36,3 +36,11 @@ libraryDependencies ++=
   "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809" ::
   "net.glxn.qrgen" % "android" % "2.0" ::
   Nil
+
+lazy val goBuild = TaskKey[Unit]("go-build", "Build go and kcptun")
+goBuild := {
+  Process(Seq("mobile/src/overture/make.bash", minSdkVersion.value)) ! streams.value.log match {
+    case 0 => // Success!
+    case n => sys.error(s"Native build script exit code: $n")
+  }
+}
diff --git a/mobile/src/main/jni/overture/armeabi-v7a/liboverture.so b/mobile/src/main/jni/overture/armeabi-v7a/liboverture.so
deleted file mode 100755
index 27273c78..00000000
Binary files a/mobile/src/main/jni/overture/armeabi-v7a/liboverture.so and /dev/null differ
diff --git a/mobile/src/main/jni/overture/x86/liboverture.so b/mobile/src/main/jni/overture/x86/liboverture.so
deleted file mode 100755
index 33e19e31..00000000
Binary files a/mobile/src/main/jni/overture/x86/liboverture.so and /dev/null differ
diff --git a/mobile/src/overture b/mobile/src/overture
new file mode 160000
index 00000000..5cb3f8c9
--- /dev/null
+++ b/mobile/src/overture
@@ -0,0 +1 @@
+Subproject commit 5cb3f8c9e1723a26d408d28bbe491b1947b3e60f