diff --git a/.gitmodules b/.gitmodules
index d9a0823da5..776ed2490f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "qcolorpicker"]
 	path = qcolorpicker
 	url = https://github.com/QuadFlask/colorpicker.git
+[submodule "openpgp-api"]
+	path = openpgp-api
+	url = https://github.com/open-keychain/openpgp-api.git
diff --git a/app/build.gradle b/app/build.gradle
index 4cae5a1af4..4698c30df7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -299,7 +299,8 @@ dependencies {
 
     // https://github.com/open-keychain/openpgp-api
     // https://mvnrepository.com/artifact/org.sufficientlysecure/openpgp-api
-    implementation "org.sufficientlysecure:openpgp-api:$openpgp_version"
+    //implementation "org.sufficientlysecure:openpgp-api:$openpgp_version"
+    implementation project(':openpgp-api')
 
     // https://www.sqlite.org/changes.html
     // https://github.com/requery/sqlite-android/
diff --git a/build.gradle b/build.gradle
index a174eef2bf..8eb2b31131 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,8 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.5.3'
         // https://github.com/bugsnag/bugsnag-android-gradle-plugin
         classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.5.2'
+        // open-keychain
+        classpath 'com.novoda:bintray-release:0.8.0'
     }
 }
 
diff --git a/openpgp-api b/openpgp-api
new file mode 160000
index 0000000000..3994abb154
--- /dev/null
+++ b/openpgp-api
@@ -0,0 +1 @@
+Subproject commit 3994abb154a38374be666f58a7767e10850dda76
diff --git a/settings.gradle b/settings.gradle
index e7b4def49c..5dd724a506 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
-include ':app'
+include ':app', ':openpgp-api'
+project(':openpgp-api').projectDir = new File('openpgp-api/openpgp-api')