diff --git a/changelog b/changelog
index c7f52f37910..e79a0b0087b 100644
--- a/changelog
+++ b/changelog
@@ -105,6 +105,7 @@ Version 1.9.0-svn:
    * adjusted all underground terrain to harmonize with other terrains
    * improved mini-map appearance for most chasm, wall and grass terrains
    * stone path now matches other terrains
+   * added wooden floor terrain
  * Terrain WML
    * rename TRANSITION_RESTRICTED and TRANSITION_RESTRICTED2 to
      OVERLAY_ROTATION_RESTRICTED and OVERLAY_ROTATION_RESTRICTED2
diff --git a/data/core/images/terrain/interior/wood-regular.png b/data/core/images/terrain/interior/wood-regular.png
new file mode 100644
index 00000000000..92cb1a91a0b
Binary files /dev/null and b/data/core/images/terrain/interior/wood-regular.png differ
diff --git a/data/core/images/terrain/interior/wood-regular2.png b/data/core/images/terrain/interior/wood-regular2.png
new file mode 100644
index 00000000000..cebcb8c8d0b
Binary files /dev/null and b/data/core/images/terrain/interior/wood-regular2.png differ
diff --git a/data/core/images/terrain/interior/wood-regular3.png b/data/core/images/terrain/interior/wood-regular3.png
new file mode 100644
index 00000000000..e3a764ca3ec
Binary files /dev/null and b/data/core/images/terrain/interior/wood-regular3.png differ
diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg
index 596fb77902b..1f84781f535 100644
--- a/data/core/terrain-graphics.cfg
+++ b/data/core/terrain-graphics.cfg
@@ -351,6 +351,7 @@
 
 {TERRAIN_BASE_RANDOM     Ha                                                        hills/snow}
 
+{TERRAIN_BASE_RANDOM     Iwr                                                       interior/wood-regular}
 
 # Water base terrains
 {OVERLAY_L               Wwr                                         -518          water/reef}
diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg
index 17da4c1bd84..bba7b6fab79 100644
--- a/data/core/terrain.cfg
+++ b/data/core/terrain.cfg
@@ -693,6 +693,19 @@
 [/terrain_type]
 
 
+#
+#    ## Interior ##
+#
+
+[terrain_type]
+    symbol_image=interior/wood-regular
+    name= _ "wood_floor"
+    string=Iwr
+    aliasof=_Gt
+    editor_group=flat
+[/terrain_type]
+
+
 #
 #    ## Underground ##
 #
@@ -828,7 +841,7 @@
 #
 
 [terrain_type]
-    symbol_image=unwalkable/chasm
+    symbol_image=unwalkable/chasm  
     editor_image=unwalkable/chasm-tile
     id=canyon
     name= _ "Chasm"
@@ -848,7 +861,7 @@
 #[/terrain_type]
 
 [terrain_type]
-    symbol_image=unwalkable/abyss
+    symbol_image=unwalkable/abyss          
     editor_image=unwalkable/abyss-tile
     id=abyss
     name= _ "Ethereal Abyss"
@@ -858,7 +871,7 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=unwalkable/lava
+    symbol_image=unwalkable/lava           
     editor_image=unwalkable/lava-chasm-tile
     id=lava_chasm
     name= _ "Lava chasm"
@@ -1675,7 +1688,7 @@
 #  ######## Basic Stone Bridge
 
 [terrain_type]
-    symbol_image=bridge/stonebridge-n-s-tile
+    symbol_image=bridge/stone-basic-s-n-tile
     id=stone_bridge
     name= _ "Bridge"
     string=^Bsb|
@@ -1686,7 +1699,7 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=bridge/stonebridge-se-nw-tile
+    symbol_image=bridge/stone-basic-se-nw-tile
     id=stone_bridge
     name= _ "Bridge"
     string=^Bsb\
@@ -1697,7 +1710,7 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=bridge/stonebridge-ne-sw-tile
+    symbol_image=bridge/stone-basic-sw-ne-tile
     id=stone_bridge
     name= _ "Bridge"
     string=^Bsb/
diff --git a/players_changelog b/players_changelog
index c43594a1a62..743ee49c5d7 100644
--- a/players_changelog
+++ b/players_changelog
@@ -27,9 +27,10 @@ Version 1.9.0-svn:
  * Graphics:
    * New Terrains: stone-wall-lit, snowy castle, snowy fort, desert castle,
      tropical water, dead grass, dark dirt, mine rail tracks, dry hills,
-     etherial abyss, clean cobbled road, dark flagstones mainlined from UtBS.
+     etherial abyss, clean cobbled road, dark flagstones mainlined from UtBS
+     and, wood floor.
    * Improved Terrains: animated water, grass, savanna, desert road, cobbled
-     road, human city village.
+     road, human city village, overgrown path.
    * New Portraits: Orc Archer, Crossbowman, Slurbow, Slayer, Orc Grunt line
      alternates #4, #5 and #6, Draug and alternate, Ghoul, Skeleton Archer line
      Giant Mudcrawler, Orc Leader/Ruler, an alternate Leader and Sovereign,