diff --git a/.gitignore b/.gitignore
index acb3f4065ea1c7cc4544872da2980840374cda35..a97bc3ac4456f1b5f467fcae7122ba79c93e3033 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,8 @@
 comprehensive-gpl-guide.log
 # bkuhn often makes an x.ps file in intermediate testing.
 x.ps
+# Emacs temporary files
+*~
+\#*\#
+.\#*
+auto-save-list