diff --git a/changelog b/changelog
index ddf61a5947c..dcbeedcb979 100644
--- a/changelog
+++ b/changelog
@@ -33,6 +33,7 @@ Version 1.9.0-svn:
    * added new "tropical water"
    * improved dry grass ÒsavannaÓ terrain
    * fix for dwarven castle to cave wall alignment issue by Alarantalara
+   * improved Òdesert roadÓ based off the dirt terrain
  * User interface:
    * Removed the unused gui2 menu bar
    * Added a window register framework
diff --git a/data/core/images/terrain/desert-road-n-ne-se.png b/data/core/images/terrain/flat/desert-road-n-ne-se.png
similarity index 100%
rename from data/core/images/terrain/desert-road-n-ne-se.png
rename to data/core/images/terrain/flat/desert-road-n-ne-se.png
diff --git a/data/core/images/terrain/desert-road-n-ne.png b/data/core/images/terrain/flat/desert-road-n-ne.png
similarity index 100%
rename from data/core/images/terrain/desert-road-n-ne.png
rename to data/core/images/terrain/flat/desert-road-n-ne.png
diff --git a/data/core/images/terrain/desert-road-n.png b/data/core/images/terrain/flat/desert-road-n.png
similarity index 100%
rename from data/core/images/terrain/desert-road-n.png
rename to data/core/images/terrain/flat/desert-road-n.png
diff --git a/data/core/images/terrain/desert-road-ne-se-s.png b/data/core/images/terrain/flat/desert-road-ne-se-s.png
similarity index 100%
rename from data/core/images/terrain/desert-road-ne-se-s.png
rename to data/core/images/terrain/flat/desert-road-ne-se-s.png
diff --git a/data/core/images/terrain/desert-road-ne-se.png b/data/core/images/terrain/flat/desert-road-ne-se.png
similarity index 100%
rename from data/core/images/terrain/desert-road-ne-se.png
rename to data/core/images/terrain/flat/desert-road-ne-se.png
diff --git a/data/core/images/terrain/desert-road-ne.png b/data/core/images/terrain/flat/desert-road-ne.png
similarity index 100%
rename from data/core/images/terrain/desert-road-ne.png
rename to data/core/images/terrain/flat/desert-road-ne.png
diff --git a/data/core/images/terrain/desert-road-nw-n-ne.png b/data/core/images/terrain/flat/desert-road-nw-n-ne.png
similarity index 100%
rename from data/core/images/terrain/desert-road-nw-n-ne.png
rename to data/core/images/terrain/flat/desert-road-nw-n-ne.png
diff --git a/data/core/images/terrain/desert-road-nw-n.png b/data/core/images/terrain/flat/desert-road-nw-n.png
similarity index 100%
rename from data/core/images/terrain/desert-road-nw-n.png
rename to data/core/images/terrain/flat/desert-road-nw-n.png
diff --git a/data/core/images/terrain/desert-road-nw.png b/data/core/images/terrain/flat/desert-road-nw.png
similarity index 100%
rename from data/core/images/terrain/desert-road-nw.png
rename to data/core/images/terrain/flat/desert-road-nw.png
diff --git a/data/core/images/terrain/desert-road-s-sw-nw.png b/data/core/images/terrain/flat/desert-road-s-sw-nw.png
similarity index 100%
rename from data/core/images/terrain/desert-road-s-sw-nw.png
rename to data/core/images/terrain/flat/desert-road-s-sw-nw.png
diff --git a/data/core/images/terrain/desert-road-s-sw.png b/data/core/images/terrain/flat/desert-road-s-sw.png
similarity index 100%
rename from data/core/images/terrain/desert-road-s-sw.png
rename to data/core/images/terrain/flat/desert-road-s-sw.png
diff --git a/data/core/images/terrain/desert-road-s.png b/data/core/images/terrain/flat/desert-road-s.png
similarity index 100%
rename from data/core/images/terrain/desert-road-s.png
rename to data/core/images/terrain/flat/desert-road-s.png
diff --git a/data/core/images/terrain/desert-road-se-s-sw.png b/data/core/images/terrain/flat/desert-road-se-s-sw.png
similarity index 100%
rename from data/core/images/terrain/desert-road-se-s-sw.png
rename to data/core/images/terrain/flat/desert-road-se-s-sw.png
diff --git a/data/core/images/terrain/desert-road-se-s.png b/data/core/images/terrain/flat/desert-road-se-s.png
similarity index 100%
rename from data/core/images/terrain/desert-road-se-s.png
rename to data/core/images/terrain/flat/desert-road-se-s.png
diff --git a/data/core/images/terrain/desert-road-se.png b/data/core/images/terrain/flat/desert-road-se.png
similarity index 100%
rename from data/core/images/terrain/desert-road-se.png
rename to data/core/images/terrain/flat/desert-road-se.png
diff --git a/data/core/images/terrain/desert-road-sw-nw-n.png b/data/core/images/terrain/flat/desert-road-sw-nw-n.png
similarity index 100%
rename from data/core/images/terrain/desert-road-sw-nw-n.png
rename to data/core/images/terrain/flat/desert-road-sw-nw-n.png
diff --git a/data/core/images/terrain/desert-road-sw-nw.png b/data/core/images/terrain/flat/desert-road-sw-nw.png
similarity index 100%
rename from data/core/images/terrain/desert-road-sw-nw.png
rename to data/core/images/terrain/flat/desert-road-sw-nw.png
diff --git a/data/core/images/terrain/desert-road-sw.png b/data/core/images/terrain/flat/desert-road-sw.png
similarity index 100%
rename from data/core/images/terrain/desert-road-sw.png
rename to data/core/images/terrain/flat/desert-road-sw.png
diff --git a/data/core/images/terrain/flat/desert-road.png b/data/core/images/terrain/flat/desert-road.png
new file mode 100644
index 00000000000..9fe40ee0912
Binary files /dev/null and b/data/core/images/terrain/flat/desert-road.png differ
diff --git a/data/core/images/terrain/flat/desert-road2.png b/data/core/images/terrain/flat/desert-road2.png
new file mode 100644
index 00000000000..193c8565104
Binary files /dev/null and b/data/core/images/terrain/flat/desert-road2.png differ
diff --git a/data/core/images/terrain/flat/desert-road3.png b/data/core/images/terrain/flat/desert-road3.png
new file mode 100644
index 00000000000..ca311ced084
Binary files /dev/null and b/data/core/images/terrain/flat/desert-road3.png differ
diff --git a/data/core/images/terrain/flat/desert-road4.png b/data/core/images/terrain/flat/desert-road4.png
new file mode 100644
index 00000000000..dd1c0d406d1
Binary files /dev/null and b/data/core/images/terrain/flat/desert-road4.png differ
diff --git a/data/core/images/terrain/flat/desert-road5.png b/data/core/images/terrain/flat/desert-road5.png
new file mode 100644
index 00000000000..a2fcdeecc1d
Binary files /dev/null and b/data/core/images/terrain/flat/desert-road5.png differ
diff --git a/data/core/images/terrain/flat/desert-road6.png b/data/core/images/terrain/flat/desert-road6.png
new file mode 100644
index 00000000000..d55fbf468a2
Binary files /dev/null and b/data/core/images/terrain/flat/desert-road6.png differ
diff --git a/data/core/images/terrain/flat/desert-road7.png b/data/core/images/terrain/flat/desert-road7.png
new file mode 100644
index 00000000000..ed611e0f28e
Binary files /dev/null and b/data/core/images/terrain/flat/desert-road7.png differ
diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg
index 93f15dc3ffe..96cb94703ca 100644
--- a/data/core/terrain-graphics.cfg
+++ b/data/core/terrain-graphics.cfg
@@ -310,7 +310,7 @@
 {TERRAIN_BASE_P          Ds                                     13                 sand-rock3}
 {TERRAIN_BASE_RANDOM     Ds                                                        sand}
 
-{TERRAIN_BASE            Rd                                                        desert-road}
+{TERRAIN_BASE_RANDOM     Rd                                                        flat/desert-road}
 
 {TERRAIN_BASE_F          *^Dc                                             overlay  desert_crater}
 
@@ -556,8 +556,8 @@
 # nicely with desert and desert villages.
 
 {TRANSITION_BASE_L     Dd               (Dd^V*)                     -340               desert}
-{TRANSITION_BASE_L     Rd               (Dd^V*)                     -350               desert-road}
-{TRANSITION_BASE_L     Rd               (!,Rd,Dd)                   -351               desert-road}
+{TRANSITION_BASE_L     Rd               (Dd^V*)                     -350               flat/desert-road}
+{TRANSITION_BASE_L     Rd               (!,Rd,Dd)                   -351               flat/desert-road}
 {TRANSITION_BASE_L     Dd               (!,R*,Dd)                   -360               desert}
 {TRANSITION_BASE_L     Dd               R*                          -361               desert}
 
diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg
index e6c82aa478c..2683d6a8f8a 100644
--- a/data/core/terrain.cfg
+++ b/data/core/terrain.cfg
@@ -896,7 +896,7 @@
 #
 
 [terrain_type]
-    symbol_image=desert-road
+    symbol_image=flat/desert-road
     id=road
     name= _ "Road"
     string=Rd