diff --git a/.gitmodules b/.gitmodules
index 886fc27b6..17cbe6173 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
-[submodule "libs/openpgp-keychain"]
-	path = libs/openpgp-keychain
-	url = https://github.com/openpgp-keychain/openpgp-keychain.git
 [submodule "libs/minidns"]
 	path = libs/minidns
 	url = https://github.com/rtreffer/minidns.git
 
+[submodule "libs/openpgp-api-lib"]
+	path = libs/openpgp-api-lib
+	url = https://github.com/open-keychain/openpgp-api-lib.git
diff --git a/libs/openpgp-api-lib b/libs/openpgp-api-lib
new file mode 160000
index 000000000..650e1ebda
--- /dev/null
+++ b/libs/openpgp-api-lib
@@ -0,0 +1 @@
+Subproject commit 650e1ebda82596cd4fbfaae406e6eccf189f4f63
diff --git a/libs/openpgp-keychain b/libs/openpgp-keychain
deleted file mode 160000
index e0a0bf04e..000000000
--- a/libs/openpgp-keychain
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e0a0bf04ee6fa4794a82b44dae905bc814d85491
diff --git a/project.properties b/project.properties
index f54b95eac..86ae5d0cc 100644
--- a/project.properties
+++ b/project.properties
@@ -13,4 +13,4 @@
 # Project target.
 target=android-19
 android.library.reference.1=libs/minidns
-android.library.reference.2=libs/openpgp-keychain/OpenKeychain-API/libraries/openpgp-api-library
+android.library.reference.2=libs/openpgp-api-lib