diff --git a/.gitignore b/.gitignore
index 8533cfcd..1dedff81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *~
-autom4te.cache
 Makefile.in
 Makefile
 *.o
@@ -8,3 +7,24 @@ Makefile
 *.la
 .deps/
 .libs/
+
+# autofoo stuff
+autom4te.cache
+COPYING
+INSTALL
+aclocal.m4
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+
diff --git a/contrib/.gitignore b/contrib/.gitignore
new file mode 100644
index 00000000..fe950238
--- /dev/null
+++ b/contrib/.gitignore
@@ -0,0 +1,2 @@
+mt-daapd.conf
+
diff --git a/contrib/init.d/.gitignore b/contrib/init.d/.gitignore
new file mode 100644
index 00000000..d13e8bd8
--- /dev/null
+++ b/contrib/init.d/.gitignore
@@ -0,0 +1,4 @@
+mt-daapd-fedora
+mt-daapd-suse
+mtdaapd-bsd
+
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000..57fa3dba
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,2 @@
+mt-daapd
+
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 00000000..7666fa3e
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,2 @@
+wavstreamer
+