diff --git a/.gitignore b/.gitignore
index 435df93..7c5bfe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,28 @@
 *.deps
-*.o
-*.so
-*.pc
 *.jpg
+*.la
+*.lo
+*.o
+*.pc
+*.so
+*.swp
 *~
-aclocal.m4
-autom4te.cache/
-config.log
-config.status
-configure
-config.mk
+.libs
+/aclocal.m4
+/autom4te.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.mk
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/stamp-h1
+Makefile
+Makefile.in
diff --git a/clients/.gitignore b/clients/.gitignore
index 14a78c6..2401358 100644
--- a/clients/.gitignore
+++ b/clients/.gitignore
@@ -1,6 +1,10 @@
-gears
+dnd
 flower
-screenshot
-terminal
+gears
 image
+screenshooter-client-protocol.h
+screenshooter-protocol.c
+screenshot
+smoke
+terminal
 view
diff --git a/compositor/.gitignore b/compositor/.gitignore
new file mode 100644
index 0000000..dc926c1
--- /dev/null
+++ b/compositor/.gitignore
@@ -0,0 +1,3 @@
+compositor
+screenshooter-protocol.c
+screenshooter-server-protocol.h
diff --git a/m4/.gitignore b/m4/.gitignore
index e69de29..38066dd 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -0,0 +1,5 @@
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
diff --git a/wayland/.gitignore b/wayland/.gitignore
new file mode 100644
index 0000000..0d28ba5
--- /dev/null
+++ b/wayland/.gitignore
@@ -0,0 +1,4 @@
+scanner
+wayland-client-protocol.h
+wayland-protocol.c
+wayland-server-protocol.h