diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42eda44e72cc9fdbd13c9e888ac780733c894912
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+.#*
diff --git a/ChangeLog b/ChangeLog
index e604c772906d8ba4374a8124b454a5e0ce0d4efb..5d5735d1e8efd091b9ac1c034ea0373fb08971c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-01  Per Cederqvist  <ceder@lysator.liu.se>
 
+	Ignore autosave files.
+	* .gitignore: Ignore autosave files.
+
 	Ryttargardskyrkan: new main file server.
 	* fetch-work-pcfritz: Replaced benjamin with gad.