diff --git a/.gitignore b/.gitignore
index 2641e1c28f..0bfffcd3c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,8 @@ stamp-h1
 **/.deps/
 **/.libs/
 **/Makefile
+m4
+config
 
 # Dependency Folder #
 #####################
@@ -50,3 +52,8 @@ deps/
 # Executables #
 ###############
 syncd/syncd
+
+# Temporary files #
+###################
+**/*~
+**/*.swp