diff --git a/.gitignore b/.gitignore
index 9bbee65b..607b04d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
+Makefile.in
+Makefile
+INSTALL
+CMDLINE
+autotools
+aclocal.m4
+configure
+config.hin
+config.log
+config.status
+config.h
+autom4te.cache
+stamp-h
+stamp-h.in
 
 # These are the default patterns globally ignored by Subversion:
 *.o
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 00000000..dd9b296c
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+*.6
diff --git a/setup/.gitignore b/setup/.gitignore
new file mode 100644
index 00000000..3a792228
--- /dev/null
+++ b/setup/.gitignore
@@ -0,0 +1,5 @@
+Makefile.in
+Makefile
+.deps
+chocolate-setup
+*.rc
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000..78beb9a8
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+*.rc
+chocolate-doom
+chocolate-server
diff --git a/textscreen/.gitignore b/textscreen/.gitignore
new file mode 100644
index 00000000..6f6e5b3b
--- /dev/null
+++ b/textscreen/.gitignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+.deps
+*.a
diff --git a/textscreen/examples/.gitignore b/textscreen/examples/.gitignore
new file mode 100644
index 00000000..e74cfdaa
--- /dev/null
+++ b/textscreen/examples/.gitignore
@@ -0,0 +1,5 @@
+Makefile.in
+Makefile
+.deps
+guitest
+calculator