diff --git a/CHANGES b/CHANGES
index 9c7b5283e..26035369f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,14 @@
 Changes for SVN top of tree:
 
+Add wall/wall/wall_door_0.base.111.png and wall_door_1.base.111.png to make
+it possible to have tight-fitting doors (no gaps due to perspective) in the
+wall arch set.  wall/wall/wall.arc modified.  Decided to use the numbering
+of the window archs.  Also, per naming of the stwall window archs, rename
+wall/stwall/stwall_2_door.base.111.png and stwall_5_door.base.111.png to
+stwall_door_1.base.111.png and stwall_door_0.base.111.png and update
+stwall.arc.
+Kevin Bulgrien 2007-01-08
+
 Add wall/stwall/stwall_2_door.base.111.png and stwall_5_door.base.111.png to
 make it possible to have tight-fitting doors (no gaps due to perspective).
 wall/stwall/stwall.arc modified.
diff --git a/wall/stwall/stwall.arc b/wall/stwall/stwall.arc
index ecafa7b07..119ea3006 100644
--- a/wall/stwall/stwall.arc
+++ b/wall/stwall/stwall.arc
@@ -25,9 +25,9 @@ move_block all
 visibility 100
 magicmap grey
 end
-Object stwall_1_4_door
+Object stwall_door_1_4
 name doorway
-face stwall_2_door.111
+face stwall_door_1.111
 no_pick 1
 visibility 100
 magicmap grey
@@ -59,9 +59,9 @@ move_block all
 visibility 100
 magicmap grey
 end
-Object stwall_2_1_1_door
+Object stwall_door_2_1_1
 name doorway
-face stwall_5_door.111
+face stwall_door_0.111
 no_pick 1
 visibility 100
 magicmap grey
diff --git a/wall/stwall/stwall_5_door.base.111.png b/wall/stwall/stwall_door_0.base.111.png
similarity index 100%
rename from wall/stwall/stwall_5_door.base.111.png
rename to wall/stwall/stwall_door_0.base.111.png
diff --git a/wall/stwall/stwall_2_door.base.111.png b/wall/stwall/stwall_door_1.base.111.png
similarity index 100%
rename from wall/stwall/stwall_2_door.base.111.png
rename to wall/stwall/stwall_door_1.base.111.png
diff --git a/wall/wall/wall.arc b/wall/wall/wall.arc
index 51bbcbab0..8f1530cd3 100644
--- a/wall/wall/wall.arc
+++ b/wall/wall/wall.arc
@@ -25,6 +25,13 @@ no_pick 1
 move_block all
 visibility 100
 end
+Object wall_door_1_4
+name doorway
+face wall_door_1.111
+color_fg brown
+no_pick 1
+visibility 100
+end
 Object wall_2_2_1
 name wall
 face wall_3.111
@@ -52,6 +59,13 @@ no_pick 1
 move_block all
 visibility 100
 end
+Object wall_door_2_1_1
+name doorway
+face wall_door_0.111
+color_fg brown
+no_pick 1
+visibility 100
+end
 Object wall_2_2_2
 name wall
 face wall_6.111
diff --git a/wall/wall/wall_door_0.base.111.png b/wall/wall/wall_door_0.base.111.png
new file mode 100644
index 000000000..5c0c0f0ff
Binary files /dev/null and b/wall/wall/wall_door_0.base.111.png differ
diff --git a/wall/wall/wall_door_1.base.111.png b/wall/wall/wall_door_1.base.111.png
new file mode 100644
index 000000000..e3eac4f24
Binary files /dev/null and b/wall/wall/wall_door_1.base.111.png differ