diff --git a/.gitignore b/.gitignore
index 4118cd001..2e60d58b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,11 @@ Makefile.in
 *.a
 *.o
 *~
+.*.swp
+*.pbxuser
+*.mode1v3
+obj*
+build*
 aclocal.m4
 autom4te.cache
 compile
@@ -16,11 +21,13 @@ config.log
 config.status
 config.sub
 configure
+configure.lineno
 depcomp
 install-sh
 libtool
 ltmain.sh
 missing
+ylwrap
 xorg-server.pc
 stamp-h?
 do-not-use-config.h
@@ -90,6 +97,8 @@ cfb32/cfbzerarcG.c
 cfb32/cfbzerarcX.c
 doc/Xserver.1x
 doc/Xserver.man
+doc/SecurityPolicy.5
+doc/SecurityPolicy.man
 hw/dmx/Xdmx
 hw/dmx/Xdmx.1x
 hw/dmx/config/dmxtodmx
@@ -205,31 +214,58 @@ hw/xfree86/xaa/mf3-xaaBitmap.c
 hw/xfree86/xaa/mf3-xaaStipple.c
 hw/xfree86/xaa/s-xaaDashLine.c
 hw/xfree86/xaa/s-xaaLine.c
+hw/xfree86/xf1bpp/maskbits.c
+hw/xfree86/xf1bpp/mfbbitblt.c
 hw/xfree86/xf1bpp/mfbbltC.c
 hw/xfree86/xf1bpp/mfbbltCI.c
 hw/xfree86/xf1bpp/mfbbltG.c
 hw/xfree86/xf1bpp/mfbbltO.c
 hw/xfree86/xf1bpp/mfbbltX.c
+hw/xfree86/xf1bpp/mfbbres.c
+hw/xfree86/xf1bpp/mfbbresd.c
+hw/xfree86/xf1bpp/mfbclip.c
+hw/xfree86/xf1bpp/mfbcmap.c
+hw/xfree86/xf1bpp/mfbfillarc.c
+hw/xfree86/xf1bpp/mfbfillrct.c
+hw/xfree86/xf1bpp/mfbfillsp.c
+hw/xfree86/xf1bpp/mfbfont.c
+hw/xfree86/xf1bpp/mfbgc.c
+hw/xfree86/xf1bpp/mfbgetsp.c
 hw/xfree86/xf1bpp/mfbigbblak.c
 hw/xfree86/xf1bpp/mfbigbwht.c
+hw/xfree86/xf1bpp/mfbhrzvert.c
+hw/xfree86/xf1bpp/mfbimage.c
+hw/xfree86/xf1bpp/mfbline.c
+hw/xfree86/xf1bpp/mfbmisc.c
 hw/xfree86/xf1bpp/mfbpablack.c
 hw/xfree86/xf1bpp/mfbpainv.c
 hw/xfree86/xf1bpp/mfbpawhite.c
 hw/xfree86/xf1bpp/mfbpgbblak.c
 hw/xfree86/xf1bpp/mfbpgbinv.c
 hw/xfree86/xf1bpp/mfbpgbwht.c
+hw/xfree86/xf1bpp/mfbpixmap.c
 hw/xfree86/xf1bpp/mfbplyblack.c
 hw/xfree86/xf1bpp/mfbplyinv.c
 hw/xfree86/xf1bpp/mfbplywhite.c
+hw/xfree86/xf1bpp/mfbpntwin.c
+hw/xfree86/xf1bpp/mfbpolypnt.c
+hw/xfree86/xf1bpp/mfbpushpxl.c
+hw/xfree86/xf1bpp/mfbscrclse.c
+hw/xfree86/xf1bpp/mfbscrinit.c
 hw/xfree86/xf1bpp/mfbseg.c
+hw/xfree86/xf1bpp/mfbsetsp.c
 hw/xfree86/xf1bpp/mfbteblack.c
 hw/xfree86/xf1bpp/mfbtewhite.c
 hw/xfree86/xf1bpp/mfbtileC.c
 hw/xfree86/xf1bpp/mfbtileG.c
+hw/xfree86/xf1bpp/mfbwindow.c
+hw/xfree86/xf1bpp/mfbzerarc.c
 hw/xfree86/xf4bpp/mfbseg.c
 hw/xfree86/xf8_32bpp/cfbgc32.c
 hw/xfree86/xf8_32bpp/cfbgc8.c
 hw/xfree86/xorg.c
+hw/xfree86/xorg.conf.example
+hw/xfree86/xorg.conf.example.pre
 hw/xnest/Xnest
 hw/xnest/Xnest.1x
 hw/xnest/Xnest.man