diff --git a/.gitmodules b/.gitmodules
index f8db64f0a..a971b6060 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,6 @@
 [submodule "extern/safeslinger-exchange"]
 	path = extern/safeslinger-exchange
 	url = https://github.com/open-keychain/exchange-android
+[submodule "extern/android-lockpattern"]
+	path = extern/android-lockpattern
+	url = https://github.com/open-keychain/android-lockpattern.git
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 6bea6954e..ff3a63fd7 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     compile project(':extern:KeybaseLib:Lib')
     compile project(':extern:TokenAutoComplete:library')
     compile project(':extern:safeslinger-exchange')
+    compile project(':extern:android-lockpattern:code')
 }
 
 android {
diff --git a/extern/android-lockpattern b/extern/android-lockpattern
new file mode 160000
index 000000000..b9fcb13dc
--- /dev/null
+++ b/extern/android-lockpattern
@@ -0,0 +1 @@
+Subproject commit b9fcb13dcaa978c6d7be2c82cf3d11a233d59735
diff --git a/settings.gradle b/settings.gradle
index 7afbe219a..2439d70e4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,4 +14,5 @@ include ':extern:minidns'
 include ':extern:KeybaseLib:Lib'
 include ':extern:TokenAutoComplete:library'
 include ':extern:safeslinger-exchange'
+include ':extern:android-lockpattern:code'
 include ':OpenKeychain-Test'