diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..b06d27ad
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libs/openpgp-keychain"]
+	path = libs/openpgp-keychain
+	url = https://github.com/siacs/openpgp-keychain.git
diff --git a/libs/openpgp-keychain b/libs/openpgp-keychain
new file mode 160000
index 00000000..a1230bbe
--- /dev/null
+++ b/libs/openpgp-keychain
@@ -0,0 +1 @@
+Subproject commit a1230bbe53d279b44038268d05d85f86ae0ff840