diff --git a/.gitignore b/.gitignore
index 98d685d7d0..36a7d1e5a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,58 +1,111 @@
 # Common
+GPATH
+GRTAGS
+GTAGS
+TAGS
 Makefile
 Makefile.in
 .deps
 .libs
 *.pc
 *.bz2
 *.rpm
+*.la
+*.lo
+*.o
 *~
 
 
 # Autobuild
 aclocal.m4
 autoconf
 autoheader
 autom4te.cache/
 automake
 build.counter
 compile
 config.guess
 config.log
 config.status
 config.sub
 configure
 depcomp
 install-sh
 include/stamp-*
 libltdl.tar
 libtool
 libtool.m4
 ltdl.m4
 ltmain.sh
 missing
 py-compile
 
-# Build targets
+# Configure targets
 cts/CTSvars.py
 cts/LSBDummy
 cts/benchmark/clubench
 include/config.h
 include/config.h.in
 include/crm_config.h
 mcp/pacemaker
 mcp/pacemaker.service
 pengine/regression.core.sh
 publican.cfg
 shell/modules/help.py
 shell/modules/ra.py
 shell/modules/ui.py
 shell/modules/vars.py
 tools/coverage.sh
 tools/crm_primitive.py
 tools/crm_report
 tools/hb2openais.sh
 
+# Build targets
+*.7
+*.7.xml
+*.7.html
+*.8
+*.8.xml
+*.8.html
+doc/*/en-US/images/*.png
+doc/*/publish
+cib/cib
+cib/cibmon
+cib/cibpipe
+crmd/atest
+crmd/crmd
+doc/Clusters_from_Scratch.txt
+doc/Pacemaker_Explained.txt
+doc/acls.html
+doc/crm_fencing.html
+fencing/stonith-test
+fencing/stonith_admin
+fencing/stonithd
+fencing/stonithd.xml
+mcp/pacemakerd
+pengine/pengine
+pengine/pengine.xml
+pengine/ptest
+shell/regression/testcases/confbasic-xml.filter
+tools/attrd
+tools/attrd_updater
+tools/cibadmin
+tools/crm_attribute
+tools/crm_diff
+tools/crm_mon
+tools/crm_node
+tools/crm_resource
+tools/crm_shadow
+tools/crm_simulate
+tools/crm_uuid
+tools/crm_verify
+tools/crmadmin
+tools/iso8601
+xml/crm.dtd
+xml/pacemaker.rng
+
 #Other 
 mock
+HTML
 pacemaker.spec
+pengine/.regression.failed.diff