diff --git a/.gitignore b/.gitignore
index 817581ae..2c1698e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,77 @@
+# Please keep each section in ASCII (LC_ALL=C sort) order.
+
+# File patterns to ignore. This applies recursively to all subdirectories.
+*.6
+*.bak
 *.html
+*.ini
+*.orig
+*.pdf
+*.pyc
+*.swp
+*.zip
+*~
+.DS_Store
+wad*.txt
+
+# Per directory patterns to ignore. These do not apply recursively to
+# subdirectories. Each line should begin with "[!]/". Please keep the
+# directories in ASCII (LC_ALL=C sort) depth first order.
+
 /COPYING.txt
 /CREDITS.txt
-lumps/freedoom.lmp
-lumps/freedm.lmp
+
+/bootstrap/*.wad
+
+/dist/*.png
+/dist/freedm.adoc
+/dist/freedoom?.adoc
+
+/graphics/*wi*.png
+/graphics/credit.png
+/graphics/fd*title.png
+/graphics/help.png
+/graphics/m_*.png
+/graphics/prboom.png
+/graphics/t_phase*.png
+!/graphics/m_dm.png
+!/graphics/m_doom.png
+!/graphics/m_lscntr.png
+!/graphics/m_lsleft.png
+!/graphics/m_lsrght.png
+!/graphics/m_skull1.png
+!/graphics/m_skull2.png
+!/graphics/m_therml.png
+!/graphics/m_thermm.png
+!/graphics/m_thermo.png
+!/graphics/m_thermr.png
+
+/graphics/text/*.png
+
+/lumps/*_deh.lmp
+/lumps/*pname.lmp
+/lumps/colormap.lmp
+/lumps/dmxgus.lmp
+/lumps/fd*txtr*.lmp
+/lumps/freedm.lmp
+/lumps/freedoom.lmp
+/lumps/genmidi.lmp
+/lumps/playpal.lmp
+
+/lumps/colormap/*.lmp
+
+/lumps/genmidi/*.lmp
+
+/lumps/playpal/playpal.lmp
+
+/lumps/textures/freedm/
+
+/lumps/textures/phase1/
+
+/lumps/textures/phase2/
+
 /scripts/wad2image
+
 /wad-images/
+
 /wads/
-wad*.txt
-*.bak
-*.pyc
-.DS_Store
diff --git a/bootstrap/.gitignore b/bootstrap/.gitignore
deleted file mode 100644
index 93e13720..00000000
--- a/bootstrap/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-doom2.wad
diff --git a/dist/.gitignore b/dist/.gitignore
deleted file mode 100644
index 82eb2ec4..00000000
--- a/dist/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.6
-*.png
-freedm.adoc
-freedoom[12].adoc
diff --git a/graphics/.gitignore b/graphics/.gitignore
deleted file mode 100644
index dfe34a74..00000000
--- a/graphics/.gitignore
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copied from titlepic/ -
-???title.png
-# Copied from text/ -
-wilv??.png
-cwilv??.png
-dmwilv??.png
-credit.png
-help.png
-m_about.png
-m_accel.png
-m_auto.png
-m_chat.png
-m_chatm.png
-m_compat.png
-m_demos.png
-m_detail.png
-m_disopt.png
-m_disp.png
-m_dmflag.png
-m_endgam.png
-m_enem.png
-m_epi?.png
-m_episod.png
-m_etcopt.png
-m_feat.png
-m_gdhigh.png
-m_gdlow.png
-m_generl.png
-m_gset.png
-m_horsen.png
-m_hud.png
-m_hurt.png
-m_jkill.png
-m_joyset.png
-m_keybnd.png
-m_ldsv.png
-m_lgttl.png
-m_loadg.png
-m_loksen.png
-m_menus.png
-m_mess.png
-m_messg.png
-m_mouse.png
-m_msens.png
-m_msgoff.png
-m_msgon.png
-m_multi.png
-m_musvol.png
-m_newg.png
-m_ngame.png
-m_nmare.png
-m_option.png
-m_optttl.png
-m_pause.png
-m_player.png
-m_quitg.png
-m_rdthis.png
-m_rough.png
-m_saveg.png
-m_scrnsz.png
-m_serial.png
-m_setup.png
-m_sfxvol.png
-m_sgttl.png
-m_skill.png
-m_sound.png
-m_stat.png
-m_status.png
-m_svol.png
-m_tcpip.png
-m_ultra.png
-m_versen.png
-m_video.png
-m_wad.png
-m_wadopt.png
-m_weap.png
-prboom.png
-t_phase1.png
-t_phase2.png
-wibp1.png
-wibp2.png
-wibp3.png
-wibp4.png
-wicolon.png
-wienter.png
-wif.png
-wifrgs.png
-wikilrs.png
-wiminus.png
-wimstar.png
-wimstt.png
-winum?.png
-wiostf.png
-wiosti.png
-wiostk.png
-wiosts.png
-wip?.png
-wipar.png
-wipcnt.png
-wiscrt2.png
-wisucks.png
-witime.png
-wivctms.png
diff --git a/graphics/text/.gitignore b/graphics/text/.gitignore
deleted file mode 100644
index 817187ca..00000000
--- a/graphics/text/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-m_*.png
-wi*.png
-wilv*.png
-cwilv*.png
-data.stamp
-dmwilv*.png
-helpbg.png
-help.png
-helpoverlay.png
-helpttl.png
-prboom.png
-graphics.stamp
-textgen.mk
-credit.png
-credtext*.png
-freettl.png
-helptext*.png
-wikilrs_horiz.png
-fd?title.png
-m_*.png
diff --git a/lumps/.gitignore b/lumps/.gitignore
deleted file mode 100644
index 18e740b0..00000000
--- a/lumps/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copied from playpal/ -
-playpal.lmp
-# Copied from colormap/ -
-*map.lmp
-# Copied from dmxgus/ -
-dmxgus.lmp
-# Copied from genmidi/ -
-genmidi.lmp
-# Copied from textures/ -
-???pname.lmp
-???txtr1.lmp
-???txtr2.lmp
-
-# Generated dehacked files
-fdm_deh.lmp
-p1_deh.lmp
-p2_deh.lmp
diff --git a/lumps/dmxgus/.gitignore b/lumps/dmxgus/.gitignore
deleted file mode 100644
index d0f8fca5..00000000
--- a/lumps/dmxgus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-ultramid.ini
diff --git a/lumps/genmidi/.gitignore b/lumps/genmidi/.gitignore
deleted file mode 100644
index 2832f1c5..00000000
--- a/lumps/genmidi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-genmidi.lmp
diff --git a/lumps/textures/Makefile b/lumps/textures/Makefile
index f98772e8..adc02920 100644
--- a/lumps/textures/Makefile
+++ b/lumps/textures/Makefile
@@ -4,6 +4,7 @@ CPP=../../scripts/simplecpp
 all: phase1/texture1.lmp phase2/texture1.lmp freedm/texture1.lmp
 
 phase1/texture1.lmp: textures.cfg
+	@mkdir phase1
 	$(CPP) -DDOOM1_VERSIONS < textures.cfg |                 \
 	./build-textures -compat_texture1=doom1/texture1.txt     \
 	                 -compat_texture2=doom1/texture2.txt     \
@@ -18,6 +19,7 @@ phase1/texture1.lmp: textures.cfg
 	cp phase1/pnames.lmp   ../fd1pname.lmp
 
 phase2/texture1.lmp: textures.cfg
+	@mkdir phase2
 	$(CPP) < textures.cfg |                                  \
 	./build-textures -compat_texture1=doom2/texture1.txt     \
 	                 -compat_pnames=doom2/pnames.txt         \
@@ -29,6 +31,7 @@ phase2/texture1.lmp: textures.cfg
 	cp phase2/pnames.lmp   ../fd2pname.lmp
 
 freedm/texture1.lmp: textures.cfg
+	@mkdir freedm
 	$(CPP) -DFREEDM < textures.cfg |                         \
 	./build-textures -compat_texture1=doom2/texture1.txt     \
 	                 -compat_pnames=doom2/pnames.txt         \
@@ -47,4 +50,4 @@ clean:
 	$(RM) ../fd1txtr1.lmp ../fd1txtr2.lmp ../fd1pname.lmp \
 	      ../fd2txtr1.lmp ../fd2pname.lmp                 \
 	      ../fdmtxtr1.lmp ../fdmpname.lmp
-
+	-rmdir phase1 phase2 freedm
diff --git a/lumps/textures/freedm/.gitignore b/lumps/textures/freedm/.gitignore
deleted file mode 100644
index 299c841e..00000000
--- a/lumps/textures/freedm/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-texture1.lmp
-pnames.lmp
-pnames.txt
diff --git a/lumps/textures/phase1/.gitignore b/lumps/textures/phase1/.gitignore
deleted file mode 100644
index ed527f8d..00000000
--- a/lumps/textures/phase1/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-texture1.lmp
-texture2.lmp
-pnames.lmp
-pnames.txt
diff --git a/lumps/textures/phase2/.gitignore b/lumps/textures/phase2/.gitignore
deleted file mode 100644
index 299c841e..00000000
--- a/lumps/textures/phase2/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-texture1.lmp
-pnames.lmp
-pnames.txt
diff --git a/manual/.gitignore b/manual/.gitignore
deleted file mode 100644
index 70c68db1..00000000
--- a/manual/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-manual.pdf