diff --git a/.gitignore b/.gitignore
index 7808c4b..6b8344e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,16 @@ pip-log.txt
 .tox
 nosetests.xml
 
+# GPG-Mailgate test files
+test/logs
+test/gpg-mailgate.conf
+
+# Emacs files
+*~
+TAGS
+TAGS-Python
+TAGS-PHP
+
 # Translations
 *.mo