diff --git a/.gitmodules b/.gitmodules
index 6fa51e40c..bdfc2ec16 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,4 +33,7 @@
 	url = https://github.com/open-keychain/TokenAutoComplete
 [submodule "extern/openpgp-card-nfc-lib"]
 	path = extern/openpgp-card-nfc-lib
-	url = https://github.com/open-keychain/openpgp-card-nfc-lib.git
\ No newline at end of file
+	url = https://github.com/open-keychain/openpgp-card-nfc-lib.git
+[submodule "extern/safeslinger-exchange"]
+	path = extern/safeslinger-exchange
+	url = https://github.com/open-keychain/exchange-android
diff --git a/extern/safeslinger-exchange b/extern/safeslinger-exchange
new file mode 160000
index 000000000..7e10175f2
--- /dev/null
+++ b/extern/safeslinger-exchange
@@ -0,0 +1 @@
+Subproject commit 7e10175f2f7560d777b93fbf365a547191dd4061