diff --git a/.gitignore b/.gitignore
index 6b3124602..8b309cc03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 .idea
 *.swp
 *.swo
+*~
 .bundle
 db/*.sqlite3
 log/*.log
 tmp/**/*
-gpg/diaspora*/*
+gpg/diaspora-development/*.gpg
+gpg/diaspora-production/*.gpg
diff --git a/gpg/diaspora-test/pubring.gpg b/gpg/diaspora-test/pubring.gpg
new file mode 100644
index 000000000..33ce2b7d9
Binary files /dev/null and b/gpg/diaspora-test/pubring.gpg differ
diff --git a/gpg/diaspora-test/random_seed b/gpg/diaspora-test/random_seed
new file mode 100644
index 000000000..303e6b5ce
Binary files /dev/null and b/gpg/diaspora-test/random_seed differ
diff --git a/gpg/diaspora-test/secring.gpg b/gpg/diaspora-test/secring.gpg
new file mode 100644
index 000000000..53286a621
Binary files /dev/null and b/gpg/diaspora-test/secring.gpg differ
diff --git a/gpg/diaspora-test/trustdb.gpg b/gpg/diaspora-test/trustdb.gpg
new file mode 100644
index 000000000..5a8d5b325
Binary files /dev/null and b/gpg/diaspora-test/trustdb.gpg differ