diff --git a/guacd/.gitignore b/guacd/.gitignore
index 6d16395c..22896dd0 100644
--- a/guacd/.gitignore
+++ b/guacd/.gitignore
@@ -2,3 +2,38 @@
 # Compiled proxy
 guacd
 
+# Object code
+*.o
+*.so
+*.lo
+*.la
+
+# Backup files
+*~
+
+# Release files
+*.tar.gz
+
+# Files currently being edited by vim or vi
+*.swp
+
+# automake/autoconf
+.deps/
+.libs/
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+m4/
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+
+