diff --git a/.gitignore b/.gitignore
index 082b81f9..21d7c299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,13 +3,6 @@ obj
 bin
 gen
 
-jni/src/HLSDK/halflife
-jni/src/NanoGL/nanogl
-jni/src/SDL2/SDL-mirrir
-jni/src/Xash3D/xash3d
-jni/src/XashXT/XashXT
-jni/src/MobileTouchControls/MobileTouchControls
-
 local.properties
 
 res/values/git-rev.xml
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..513ef7a2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,18 @@
+[submodule "jni/src/HLSDK/halflife"]
+	path = jni/src/HLSDK/halflife
+	url = https://github.com/SDLash3D/halflife
+[submodule "jni/src/MobileTouchControls/MobileTouchControls"]
+	path = jni/src/MobileTouchControls/MobileTouchControls
+	url = https://github.com/SDLash3D/MobileTouchControls
+[submodule "jni/src/NanoGL/nanogl"]
+	path = jni/src/NanoGL/nanogl
+	url = https://github.com/SDLash3D/nanogl
+[submodule "jni/src/SDL2/SDL-mirror"]
+	path = jni/src/SDL2/SDL-mirror
+	url = https://github.com/mittorn/SDL-mirror
+[submodule "jni/src/Xash3D/xash3d"]
+	path = jni/src/Xash3D/xash3d
+	url = https://github.com/SDLash3D/xash3d
+[submodule "jni/src/XashXT/XashXT"]
+	path = jni/src/XashXT/XashXT
+	url = https://github.com/SDLash3D/XashXT
diff --git a/.travis.yml b/.travis.yml
index f77f01ce..de77ec74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,8 @@ before_install:
   - chmod +x android-ndk-r10e-linux-x86_64.bin && ./android-ndk-r10e-linux-x86_64.bin > /dev/null
   - mv android-ndk-r10e android-ndk
   - export PATH=`pwd`/android-ndk:`pwd`/android-sdk-linux/tools:`pwd`/android-sdk-linux/platform-tools:$PATH
-  - git clone -q --depth=1 https://github.com/SDLash3D/xash3d jni/src/Xash3D/xash3d
-  - git clone -q --depth=1 https://github.com/SDLash3D/halflife jni/src/HLSDK/halflife
-  - git clone -q --depth=1 https://github.com/SDLash3D/MobileTouchControls jni/src/MobileTouchControls/MobileTouchControls
-  - git clone -q --depth=1 https://github.com/SDLash3D/nanogl jni/src/NanoGL/nanogl
-  - git clone -q --depth=1 https://github.com/SDLash3D/XashXT jni/src/XashXT/XashXT
-  - git clone -q --depth=1 https://github.com/mittorn/SDL-mirror jni/src/SDL2/SDL-mirror
+  - git submodule init 
+  - git submodule update
   - sed -i -- s/android-8/android-15/g project.properties
 script:
   - sh gen-version.sh travis build
diff --git a/jni/src/HLSDK/halflife b/jni/src/HLSDK/halflife
new file mode 160000
index 00000000..235f2f44
--- /dev/null
+++ b/jni/src/HLSDK/halflife
@@ -0,0 +1 @@
+Subproject commit 235f2f448f5cab7251206f8ff1f242e30346a4d4
diff --git a/jni/src/MobileTouchControls/MobileTouchControls b/jni/src/MobileTouchControls/MobileTouchControls
new file mode 160000
index 00000000..eefe7bc1
--- /dev/null
+++ b/jni/src/MobileTouchControls/MobileTouchControls
@@ -0,0 +1 @@
+Subproject commit eefe7bc11c4b94e2e5ecdf761bc6a52d236b11c6
diff --git a/jni/src/NanoGL/nanogl b/jni/src/NanoGL/nanogl
new file mode 160000
index 00000000..5ea04e40
--- /dev/null
+++ b/jni/src/NanoGL/nanogl
@@ -0,0 +1 @@
+Subproject commit 5ea04e4036c1b08a520699d8f3da32be31797625
diff --git a/jni/src/SDL2/SDL-mirror b/jni/src/SDL2/SDL-mirror
new file mode 160000
index 00000000..1f0b6ddc
--- /dev/null
+++ b/jni/src/SDL2/SDL-mirror
@@ -0,0 +1 @@
+Subproject commit 1f0b6ddc873a99f1bec8a4556c86bd7b6d5a85e3
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
new file mode 160000
index 00000000..cb6992d2
--- /dev/null
+++ b/jni/src/Xash3D/xash3d
@@ -0,0 +1 @@
+Subproject commit cb6992d29a29d9e7ada0ba8f301ed8e136551b69
diff --git a/jni/src/XashXT/XashXT b/jni/src/XashXT/XashXT
new file mode 160000
index 00000000..ddd34947
--- /dev/null
+++ b/jni/src/XashXT/XashXT
@@ -0,0 +1 @@
+Subproject commit ddd34947fb704777cbcdbc39e1883fb6df3187ce