diff --git a/NEWS b/NEWS
index 79c98be2..37baf0ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+New in 0.9.5
+* July 30, 2004
+
+* World builder:
+  - Added support for the FCC radio tower database.
+  - Add support for SRTM terrain data
+  - Split up many long edges to reduce artifacts in final scenery.
+  - Much smarter/better/faster/higher quality terrain simplification algorithm.
+  - Catch/fix/avoid a number of different degeneracies that could lead to
+    odd artificants in the final scenery.
+
+* Airport generator:
+  - Now handles displaced thresholds correctly.
+  - *Much* better airport surface fitting to underlying terrain data.  Employ
+    a scheme that takes the average of critical surface points and produces
+    a nurbs surface approximation to the original "noisy" terrain data.
+  - Fixed "grassy" area in the middle of some runways.
+  - Support for green taxiway centerline lighting.
+  - Support for windsocks, towers, and rotating beacons.
+  - Add support for Calvert-I/II approach lighting schemes.
+
+
 New in 0.0.5
 * February 25, 2003
 
diff --git a/README b/README
index f12d1f5c..8d3bc1e8 100644
--- a/README
+++ b/README
@@ -21,10 +21,10 @@ smaller chunks is much more doable though.
 Building the Tools
 ==================
 
-These tools are primarily compiled and tested under Unix with the gnu
-compilers.  I believe they also build and run on windows with Cygwin.
-If anyone has patches for supporting other platforms, I will be happy
-to incorporate them.
+These tools are primarily compiled and tested under Unix with the Gnu
+C/C++ compilers.  I believe they also build and run on windows with
+Cygwin.  If anyone has patches for supporting other platforms, I will
+be happy to incorporate them.
 
 The process for building these tools is very similar to building the
 main FG source code.
diff --git a/TerraGear.dsp b/TerraGear.dsp
index f51f3d6b..d491b3eb 100644
--- a/TerraGear.dsp
+++ b/TerraGear.dsp
@@ -638,6 +638,40 @@ SOURCE=.\src\Lib\Geometry\util.hxx
 
 !ENDIF 
 
+# End Source File
+# End Group
+# Begin Group "Lib_HGT"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\Lib\HGT\hgt.cxx
+
+!IF  "$(CFG)" == "TerraGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_HGT"
+
+!ELSEIF  "$(CFG)" == "TerraGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_HGT"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Lib\HGT\hgt.hxx
+
+!IF  "$(CFG)" == "TerraGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_HGT"
+
+!ELSEIF  "$(CFG)" == "TerraGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_HGT"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_landcover"
@@ -777,6 +811,36 @@ SOURCE=.\src\Lib\Output\output.hxx
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\src\Lib\Polygon\chop-bin.cxx
+
+!IF  "$(CFG)" == "TerraGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Polygon"
+
+!ELSEIF  "$(CFG)" == "TerraGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Polygon"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Lib\Polygon\chop.hxx
+
+!IF  "$(CFG)" == "TerraGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Polygon"
+
+!ELSEIF  "$(CFG)" == "TerraGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Polygon"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\Lib\Polygon\index.cxx
 
 !IF  "$(CFG)" == "TerraGear - Win32 Release"
@@ -897,36 +961,6 @@ SOURCE=.\src\Lib\Polygon\simple_clip.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Lib\Polygon\split-bin.cxx
-
-!IF  "$(CFG)" == "TerraGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_Polygon"
-
-!ELSEIF  "$(CFG)" == "TerraGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_Polygon"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\Lib\Polygon\split.hxx
-
-!IF  "$(CFG)" == "TerraGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_Polygon"
-
-!ELSEIF  "$(CFG)" == "TerraGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_Polygon"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\src\Lib\Polygon\superpoly.cxx
 
 !IF  "$(CFG)" == "TerraGear - Win32 Release"
diff --git a/configure.ac b/configure.ac
index 5093078d..28c28ce9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR([src/Lib/DEM/dem.cxx])
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(TerraGear, 0.0.6)
+AM_INIT_AUTOMAKE(TerraGear, 0.9.5)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -222,7 +222,7 @@ if test "x$ac_cv_lib_glut_glutGameModeString" = "xno"; then
     exit 1
 fi
 
-# needed for plib 1.6.x or later
+# needed for plib 1.8.x or later
 AC_CHECK_LIB(plibul, ulInit,,,)
 
 opengl_LIBS="$LIBS"
@@ -322,7 +322,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 0
+#define MIN_MICRO 6
 
 int main() {
     int major, minor, micro;
diff --git a/src/BuildTiles/GenOutput/genobj.cxx b/src/BuildTiles/GenOutput/genobj.cxx
index 2c45b614..6863bfdb 100644
--- a/src/BuildTiles/GenOutput/genobj.cxx
+++ b/src/BuildTiles/GenOutput/genobj.cxx
@@ -338,7 +338,7 @@ int TGGenOutput::write_orig( TGConstruct &c ) {
     string base = c.get_output_base();
     SGBucket b = c.get_bucket();
 
-    string dir = base + "/Scenery/" + b.gen_base_path();
+    string dir = base + b.gen_base_path();
 
 #ifdef _MSC_VER
     fg_mkdir( dir.c_str() );
@@ -455,7 +455,7 @@ int TGGenOutput::write( TGConstruct &c ) {
     // Assemble all the data into the final format
 
     SGBucket b = c.get_bucket();
-    string base = c.get_output_base() + "/Scenery/";
+    string base = c.get_output_base();
     string name = b.gen_index_str();
     name += ".btg";
 
diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx
index 10174471..95b7cc76 100644
--- a/src/BuildTiles/Main/main.cxx
+++ b/src/BuildTiles/Main/main.cxx
@@ -976,7 +976,7 @@ static void do_custom_objects( const TGConstruct& c ) {
 
     // Create/open the output .stg file for writing
     string output_base = c.get_output_base();
-    string dest_dir = output_base + "/Scenery/" + b.gen_base_path();
+    string dest_dir = output_base + "/" + b.gen_base_path();
     string dest_ind = dest_dir + "/" + b.gen_index_str() + ".stg";
 
     FILE *fp;
diff --git a/src/BuildTiles/Parallel/fgfs-launch-clients b/src/BuildTiles/Parallel/fgfs-launch-clients
index 5e20f398..6d3b7158 100755
--- a/src/BuildTiles/Parallel/fgfs-launch-clients
+++ b/src/BuildTiles/Parallel/fgfs-launch-clients
@@ -34,7 +34,7 @@ else
     WORK_BASE="${BASE_DIR}/Work"
     CLIENT_LIST_RUDE="${WORK_BASE}/clients.rude"
     CLIENT_LIST_NICE="${WORK_BASE}/clients.nice"
-    OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.4"
+    OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.5"
     LOG_DIR="${WORK_BASE}/Status"
     SERVER_LOG_FILE=${LOG_DIR}/server.log
     echo "Base directory is $BASE_DIR"
diff --git a/src/BuildTiles/Parallel/fgfs-launch-server b/src/BuildTiles/Parallel/fgfs-launch-server
index 69c2d738..6e012dcb 100755
--- a/src/BuildTiles/Parallel/fgfs-launch-server
+++ b/src/BuildTiles/Parallel/fgfs-launch-server
@@ -33,7 +33,7 @@ else
     BASE_DIR=$1
     shift
     WORK_BASE="${BASE_DIR}/Work"
-    OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.4"
+    OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.5"
     MASTER_ON="${WORK_BASE}/Status/MASTER_ON"
     LOG_DIR="${WORK_BASE}/Status"
     LOG_FILE="${LOG_DIR}/server.log"
diff --git a/src/BuildTiles/Parallel/genworklist.sh b/src/BuildTiles/Parallel/genworklist.sh
index bf7c1688..2dd2c39d 100755
--- a/src/BuildTiles/Parallel/genworklist.sh
+++ b/src/BuildTiles/Parallel/genworklist.sh
@@ -1,10 +1,10 @@
 #! /bin/bash
 
 for lat in s90 s80 s70 s60 s50 s40 s30 s20 s10 n00 n10 n20 n30 n40 n50 n60 \
-	n70 n80; do
+           n70 n80; do
     for lon in w180 w170 w160 w150 w140 w130 w120 w110 w100 w090 w080 w070 \
-		w060 w050 w040 w030 w020 w010 e000 e010 e020 e030 e040 e050 \
-		e060 e070 e080 e090 e100 e110 e120 e130 e140 e150 e160 e170; do
+               w060 w050 w040 w030 w020 w010 e000 e010 e020 e030 e040 e050 \
+	       e060 e070 e080 e090 e100 e110 e120 e130 e140 e150 e160 e170; do
         echo "${lon}${lat}"
     done
 done
diff --git a/src/Prep/Terra/Makefile.am b/src/Prep/Terra/Makefile.am
index 6a988aef..21358d62 100644
--- a/src/Prep/Terra/Makefile.am
+++ b/src/Prep/Terra/Makefile.am
@@ -1,8 +1,10 @@
+EXTRA_DIST = Makefile.gcc-2.95 Makefile.orig
+
 bin_PROGRAMS = terra xterra
 
 terra_SOURCES = \
 	Array.h Geom.h GreedyInsert.cc GreedyInsert.h Heap.cc Heap.h \
-	Makefile-gcc-2.95 Makefile.am Makefile.orig Map.cc Map.h Mask.cc \
+	Map.cc Map.h Mask.cc \
 	Mask.h Quadedge.cc Quadedge.h Subdivision.cc Subdivision.h Vec2.h \
 	Vec3.h cmdline.cc glHacks.cc glHacks.h greedy.cc gui.cc gui.h \
 	output.cc terra.cc terra.h version.h
@@ -11,7 +13,7 @@ terra_LDADD = $(opengl_LIBS)
 
 xterra_SOURCES = \
 	Array.h Geom.h GreedyInsert.cc GreedyInsert.h Heap.cc Heap.h \
-	Makefile-gcc-2.95 Makefile.am Makefile.orig Map.cc Map.h Mask.cc \
+	Map.cc Map.h Mask.cc \
 	Mask.h Quadedge.cc Quadedge.h Subdivision.cc Subdivision.h Vec2.h \
 	Vec3.h cmdline.cc glHacks.cc glHacks.h greedy.cc gui.cc gui.h \
 	output.cc terra.h version.h xterra.cc
diff --git a/src/Prep/TerraFit/terrafit.py b/src/Prep/TerraFit/terrafit.py
index e501e967..7d3dc003 100755
--- a/src/Prep/TerraFit/terrafit.py
+++ b/src/Prep/TerraFit/terrafit.py
@@ -38,7 +38,7 @@ def pre_terra(pgmName, data, span_x, span_y, max_z, min_z):
 ##
 def run_terra(thresh, minnodes, count, factor, objName, pgmName):
     print
-    command = "terra -e %f -n %d -p %d -h %f -o %s obj %s"%(thresh, minnodes, count, factor, objName, pgmName)
+    command = "../Terra/terra -e %f -n %d -p %d -h %f -o %s obj %s"%(thresh, minnodes, count, factor, objName, pgmName)
     print command
     npts = -1
     error = -99999.9
diff --git a/src/Prep/Tower/Makefile.am b/src/Prep/Tower/Makefile.am
index baa23b3d..62ff8ee2 100644
--- a/src/Prep/Tower/Makefile.am
+++ b/src/Prep/Tower/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = calc_tile.pl tower.pl
+EXTRA_DIST = calc-tile.pl tower.pl
diff --git a/src/Utils/cdrom/layout-0.7.9 b/src/Utils/cdrom/layout-0.7.9
deleted file mode 100644
index 205a0249..00000000
--- a/src/Utils/cdrom/layout-0.7.9
+++ /dev/null
@@ -1,535 +0,0 @@
-Africa/e000n00.tar.gz
-Africa/e000n10.tar.gz
-Africa/e000n20.tar.gz
-Africa/e000n30.tar.gz
-Africa/e000s10.tar.gz
-Africa/e010n00.tar.gz
-Africa/e010n10.tar.gz
-Africa/e010n20.tar.gz
-Africa/e010n30.tar.gz
-Africa/e010s10.tar.gz
-Africa/e010s20.tar.gz
-Africa/e010s30.tar.gz
-Africa/e010s40.tar.gz
-Africa/e020n00.tar.gz
-Africa/e020n10.tar.gz
-Africa/e020n20.tar.gz
-Africa/e020n30.tar.gz
-Africa/e020s10.tar.gz
-Africa/e020s20.tar.gz
-Africa/e020s30.tar.gz
-Africa/e020s40.tar.gz
-Africa/e030n00.tar.gz
-Africa/e030n10.tar.gz
-Africa/e030n20.tar.gz
-Africa/e030n30.tar.gz
-Africa/e030s10.tar.gz
-Africa/e030s20.tar.gz
-Africa/e030s30.tar.gz
-Africa/e030s40.tar.gz
-Africa/e030s50.tar.gz
-Africa/e040n00.tar.gz
-Africa/e040n10.tar.gz
-Africa/e040n20.tar.gz
-Africa/e040s10.tar.gz
-Africa/e040s20.tar.gz
-Africa/e040s30.tar.gz
-Africa/e050n00.tar.gz
-Africa/e050n10.tar.gz
-Africa/e050s10.tar.gz
-Africa/e050s20.tar.gz
-Africa/e050s30.tar.gz
-Africa/e050s50.tar.gz
-Africa/e060s20.tar.gz
-Africa/e060s50.tar.gz
-Africa/e060s60.tar.gz
-Africa/e070s40.tar.gz
-Africa/e070s50.tar.gz
-Africa/e070s60.tar.gz
-Africa/w010n00.tar.gz
-Africa/w010n10.tar.gz
-Africa/w010n20.tar.gz
-Africa/w010n30.tar.gz
-Africa/w010s20.tar.gz
-Africa/w020n00.tar.gz
-Africa/w020n10.tar.gz
-Africa/w020n20.tar.gz
-Africa/w020n30.tar.gz
-Africa/w020s10.tar.gz
-Africa/w030n10.tar.gz
-Africa/w030n30.tar.gz
-Asia-East/e030n20.tar.gz
-Asia-East/e040n10.tar.gz
-Asia-East/e040n20.tar.gz
-Asia-East/e050n10.tar.gz
-Asia-East/e050n20.tar.gz
-Asia-East/e050n30.tar.gz
-Asia-East/e050n40.tar.gz
-Asia-East/e050n50.tar.gz
-Asia-East/e050n60.tar.gz
-Asia-East/e050n70.tar.gz
-Asia-East/e060n20.tar.gz
-Asia-East/e060n30.tar.gz
-Asia-East/e060n40.tar.gz
-Asia-East/e060n50.tar.gz
-Asia-East/e060n60.tar.gz
-Asia-East/e060n70.tar.gz
-Asia-East/e070n00.tar.gz
-Asia-East/e070n10.tar.gz
-Asia-East/e070n20.tar.gz
-Asia-East/e070n30.tar.gz
-Asia-East/e070n40.tar.gz
-Asia-East/e070n50.tar.gz
-Asia-East/e070n60.tar.gz
-Asia-East/e070n70.tar.gz
-Asia-East/e070s10.tar.gz
-Asia-East/e080n00.tar.gz
-Asia-East/e080n10.tar.gz
-Asia-East/e080n20.tar.gz
-Asia-East/e080n30.tar.gz
-Asia-East/e080n40.tar.gz
-Asia-East/e080n50.tar.gz
-Asia-East/e080n60.tar.gz
-Asia-East/e080n70.tar.gz
-Asia-East/e090n00.tar.gz
-Asia-East/e090n10.tar.gz
-Asia-East/e090n20.tar.gz
-Asia-East/e090n30.tar.gz
-Asia-East/e090n40.tar.gz
-Asia-East/e090n50.tar.gz
-Asia-East/e090n60.tar.gz
-Asia-East/e090n70.tar.gz
-Asia-West/e070n80.tar.gz
-Asia-West/e080n80.tar.gz
-Asia-West/e090n80.tar.gz
-Asia-West/e100n00.tar.gz
-Asia-West/e100n10.tar.gz
-Asia-West/e100n20.tar.gz
-Asia-West/e100n30.tar.gz
-Asia-West/e100n40.tar.gz
-Asia-West/e100n50.tar.gz
-Asia-West/e100n60.tar.gz
-Asia-West/e100n70.tar.gz
-Asia-West/e110n00.tar.gz
-Asia-West/e110n10.tar.gz
-Asia-West/e110n20.tar.gz
-Asia-West/e110n30.tar.gz
-Asia-West/e110n40.tar.gz
-Asia-West/e110n50.tar.gz
-Asia-West/e110n60.tar.gz
-Asia-West/e110n70.tar.gz
-Asia-West/e120n00.tar.gz
-Asia-West/e120n10.tar.gz
-Asia-West/e120n20.tar.gz
-Asia-West/e120n30.tar.gz
-Asia-West/e120n40.tar.gz
-Asia-West/e120n50.tar.gz
-Asia-West/e120n60.tar.gz
-Asia-West/e120n70.tar.gz
-Asia-West/e130n00.tar.gz
-Asia-West/e130n10.tar.gz
-Asia-West/e130n20.tar.gz
-Asia-West/e130n30.tar.gz
-Asia-West/e130n40.tar.gz
-Asia-West/e130n50.tar.gz
-Asia-West/e130n60.tar.gz
-Asia-West/e130n70.tar.gz
-Asia-West/e140n00.tar.gz
-Asia-West/e140n10.tar.gz
-Asia-West/e140n20.tar.gz
-Asia-West/e140n30.tar.gz
-Asia-West/e140n40.tar.gz
-Asia-West/e140n50.tar.gz
-Asia-West/e140n60.tar.gz
-Asia-West/e140n70.tar.gz
-Asia-West/e150n00.tar.gz
-Asia-West/e150n20.tar.gz
-Asia-West/e150n40.tar.gz
-Asia-West/e150n50.tar.gz
-Asia-West/e150n60.tar.gz
-Asia-West/e150n70.tar.gz
-Asia-West/e160n00.tar.gz
-Asia-West/e160n10.tar.gz
-Asia-West/e160n50.tar.gz
-Asia-West/e160n60.tar.gz
-Asia-West/e160n70.tar.gz
-Asia-West/e170n00.tar.gz
-Asia-West/e170n10.tar.gz
-Asia-West/e170n60.tar.gz
-Asia-West/e170n70.tar.gz
-Asia-West/w180n60.tar.gz
-Asia-West/w180n70.tar.gz
-Australia/e090n00.tar.gz
-Australia/e090s10.tar.gz
-Australia/e090s20.tar.gz
-Australia/e100n00.tar.gz
-Australia/e100s10.tar.gz
-Australia/e100s20.tar.gz
-Australia/e110n00.tar.gz
-Australia/e110s10.tar.gz
-Australia/e110s20.tar.gz
-Australia/e110s30.tar.gz
-Australia/e110s40.tar.gz
-Australia/e120n00.tar.gz
-Australia/e120s10.tar.gz
-Australia/e120s20.tar.gz
-Australia/e120s30.tar.gz
-Australia/e120s40.tar.gz
-Australia/e130n00.tar.gz
-Australia/e130s10.tar.gz
-Australia/e130s20.tar.gz
-Australia/e130s30.tar.gz
-Australia/e130s40.tar.gz
-Australia/e140n00.tar.gz
-Australia/e140s10.tar.gz
-Australia/e140s20.tar.gz
-Australia/e140s30.tar.gz
-Australia/e140s40.tar.gz
-Australia/e140s50.tar.gz
-Australia/e150n00.tar.gz
-Australia/e150s10.tar.gz
-Australia/e150s20.tar.gz
-Australia/e150s30.tar.gz
-Australia/e150s40.tar.gz
-Australia/e150s60.tar.gz
-Australia/e160n00.tar.gz
-Australia/e160s10.tar.gz
-Australia/e160s20.tar.gz
-Australia/e160s30.tar.gz
-Australia/e160s50.tar.gz
-Australia/e160s60.tar.gz
-Australia/e170n00.tar.gz
-Australia/e170s10.tar.gz
-Australia/e170s20.tar.gz
-Australia/e170s30.tar.gz
-Australia/e170s40.tar.gz
-Australia/e170s50.tar.gz
-Australia/w130s30.tar.gz
-Australia/w140s10.tar.gz
-Australia/w140s20.tar.gz
-Australia/w140s30.tar.gz
-Australia/w150s10.tar.gz
-Australia/w150s20.tar.gz
-Australia/w150s30.tar.gz
-Australia/w160n00.tar.gz
-Australia/w160s10.tar.gz
-Australia/w160s20.tar.gz
-Australia/w160s30.tar.gz
-Australia/w170n00.tar.gz
-Australia/w170s10.tar.gz
-Australia/w170s20.tar.gz
-Australia/w180n00.tar.gz
-Australia/w180s10.tar.gz
-Australia/w180s20.tar.gz
-Australia/w180s30.tar.gz
-Australia/w180s40.tar.gz
-Australia/w180s50.tar.gz
-Europe/e000n30.tar.gz
-Europe/e000n40.tar.gz
-Europe/e000n50.tar.gz
-Europe/e000n60.tar.gz
-Europe/e010n30.tar.gz
-Europe/e010n40.tar.gz
-Europe/e010n50.tar.gz
-Europe/e010n60.tar.gz
-Europe/e010n70.tar.gz
-Europe/e010n80.tar.gz
-Europe/e020n30.tar.gz
-Europe/e020n40.tar.gz
-Europe/e020n50.tar.gz
-Europe/e020n60.tar.gz
-Europe/e020n70.tar.gz
-Europe/e020n80.tar.gz
-Europe/e030n30.tar.gz
-Europe/e030n40.tar.gz
-Europe/e030n50.tar.gz
-Europe/e030n60.tar.gz
-Europe/e030n70.tar.gz
-Europe/e030n80.tar.gz
-Europe/e040n30.tar.gz
-Europe/e040n40.tar.gz
-Europe/e040n50.tar.gz
-Europe/e040n60.tar.gz
-Europe/e040n70.tar.gz
-Europe/e040n80.tar.gz
-Europe/e050n30.tar.gz
-Europe/e050n40.tar.gz
-Europe/e050n50.tar.gz
-Europe/e050n60.tar.gz
-Europe/e050n70.tar.gz
-Europe/e050n80.tar.gz
-Europe/e060n60.tar.gz
-Europe/e060n70.tar.gz
-Europe/e060n80.tar.gz
-Europe/e070n80.tar.gz
-Europe/e080n80.tar.gz
-Europe/e090n80.tar.gz
-Europe/w010n30.tar.gz
-Europe/w010n40.tar.gz
-Europe/w010n50.tar.gz
-Europe/w010n60.tar.gz
-Europe/w010n70.tar.gz
-Europe/w020n30.tar.gz
-Europe/w020n50.tar.gz
-Europe/w020n60.tar.gz
-Europe/w030n30.tar.gz
-Europe/w030n60.tar.gz
-Europe/w040n30.tar.gz
-NorthAmerica-East/w020n70.tar.gz
-NorthAmerica-East/w020n80.tar.gz
-NorthAmerica-East/w030n60.tar.gz
-NorthAmerica-East/w030n70.tar.gz
-NorthAmerica-East/w030n80.tar.gz
-NorthAmerica-East/w040n60.tar.gz
-NorthAmerica-East/w040n70.tar.gz
-NorthAmerica-East/w040n80.tar.gz
-NorthAmerica-East/w050n50.tar.gz
-NorthAmerica-East/w050n60.tar.gz
-NorthAmerica-East/w050n70.tar.gz
-NorthAmerica-East/w050n80.tar.gz
-NorthAmerica-East/w060n10.tar.gz
-NorthAmerica-East/w060n40.tar.gz
-NorthAmerica-East/w060n50.tar.gz
-NorthAmerica-East/w060n60.tar.gz
-NorthAmerica-East/w060n70.tar.gz
-NorthAmerica-East/w060n80.tar.gz
-NorthAmerica-East/w070n10.tar.gz
-NorthAmerica-East/w070n30.tar.gz
-NorthAmerica-East/w070n40.tar.gz
-NorthAmerica-East/w070n50.tar.gz
-NorthAmerica-East/w070n60.tar.gz
-NorthAmerica-East/w070n70.tar.gz
-NorthAmerica-East/w070n80.tar.gz
-NorthAmerica-East/w080n00.tar.gz
-NorthAmerica-East/w080n10.tar.gz
-NorthAmerica-East/w080n20.tar.gz
-NorthAmerica-East/w080n30.tar.gz
-NorthAmerica-East/w080n40.tar.gz
-NorthAmerica-East/w080n50.tar.gz
-NorthAmerica-East/w080n60.tar.gz
-NorthAmerica-East/w080n70.tar.gz
-NorthAmerica-East/w080n80.tar.gz
-NorthAmerica-East/w090n00.tar.gz
-NorthAmerica-East/w090n10.tar.gz
-NorthAmerica-East/w090n20.tar.gz
-NorthAmerica-East/w090n30.tar.gz
-NorthAmerica-East/w090n40.tar.gz
-NorthAmerica-East/w090n50.tar.gz
-NorthAmerica-East/w090n60.tar.gz
-NorthAmerica-East/w090n70.tar.gz
-NorthAmerica-East/w090n80.tar.gz
-NorthAmerica-East/w100n10.tar.gz
-NorthAmerica-East/w100n20.tar.gz
-NorthAmerica-East/w100n30.tar.gz
-NorthAmerica-East/w100n40.tar.gz
-NorthAmerica-East/w100n50.tar.gz
-NorthAmerica-East/w100n60.tar.gz
-NorthAmerica-East/w100n70.tar.gz
-NorthAmerica-East/w100n80.tar.gz
-NorthAmerica-West/e170n50.tar.gz
-NorthAmerica-West/w110n10.tar.gz
-NorthAmerica-West/w110n20.tar.gz
-NorthAmerica-West/w110n30.tar.gz
-NorthAmerica-West/w110n40.tar.gz
-NorthAmerica-West/w110n50.tar.gz
-NorthAmerica-West/w110n60.tar.gz
-NorthAmerica-West/w110n70.tar.gz
-NorthAmerica-West/w110n80.tar.gz
-NorthAmerica-West/w120n10.tar.gz
-NorthAmerica-West/w120n20.tar.gz
-NorthAmerica-West/w120n30.tar.gz
-NorthAmerica-West/w120n40.tar.gz
-NorthAmerica-West/w120n50.tar.gz
-NorthAmerica-West/w120n60.tar.gz
-NorthAmerica-West/w120n70.tar.gz
-NorthAmerica-West/w130n30.tar.gz
-NorthAmerica-West/w130n40.tar.gz
-NorthAmerica-West/w130n50.tar.gz
-NorthAmerica-West/w130n60.tar.gz
-NorthAmerica-West/w130n70.tar.gz
-NorthAmerica-West/w140n50.tar.gz
-NorthAmerica-West/w140n60.tar.gz
-NorthAmerica-West/w140n70.tar.gz
-NorthAmerica-West/w150n50.tar.gz
-NorthAmerica-West/w150n60.tar.gz
-NorthAmerica-West/w150n70.tar.gz
-NorthAmerica-West/w160n10.tar.gz
-NorthAmerica-West/w160n20.tar.gz
-NorthAmerica-West/w160n50.tar.gz
-NorthAmerica-West/w160n60.tar.gz
-NorthAmerica-West/w160n70.tar.gz
-NorthAmerica-West/w170n10.tar.gz
-NorthAmerica-West/w170n20.tar.gz
-NorthAmerica-West/w170n50.tar.gz
-NorthAmerica-West/w170n60.tar.gz
-NorthAmerica-West/w170n70.tar.gz
-NorthAmerica-West/w180n20.tar.gz
-NorthAmerica-West/w180n50.tar.gz
-SouthAmerica-Antartica/e000s60.tar.gz
-SouthAmerica-Antartica/e000s70.tar.gz
-SouthAmerica-Antartica/e000s80.tar.gz
-SouthAmerica-Antartica/e000s90.tar.gz
-SouthAmerica-Antartica/e010s70.tar.gz
-SouthAmerica-Antartica/e010s80.tar.gz
-SouthAmerica-Antartica/e010s90.tar.gz
-SouthAmerica-Antartica/e020s70.tar.gz
-SouthAmerica-Antartica/e020s80.tar.gz
-SouthAmerica-Antartica/e020s90.tar.gz
-SouthAmerica-Antartica/e030s70.tar.gz
-SouthAmerica-Antartica/e030s80.tar.gz
-SouthAmerica-Antartica/e030s90.tar.gz
-SouthAmerica-Antartica/e040s70.tar.gz
-SouthAmerica-Antartica/e040s80.tar.gz
-SouthAmerica-Antartica/e040s90.tar.gz
-SouthAmerica-Antartica/e050s70.tar.gz
-SouthAmerica-Antartica/e050s80.tar.gz
-SouthAmerica-Antartica/e050s90.tar.gz
-SouthAmerica-Antartica/e060s70.tar.gz
-SouthAmerica-Antartica/e060s80.tar.gz
-SouthAmerica-Antartica/e060s90.tar.gz
-SouthAmerica-Antartica/e070s70.tar.gz
-SouthAmerica-Antartica/e070s80.tar.gz
-SouthAmerica-Antartica/e070s90.tar.gz
-SouthAmerica-Antartica/e080s70.tar.gz
-SouthAmerica-Antartica/e080s80.tar.gz
-SouthAmerica-Antartica/e080s90.tar.gz
-SouthAmerica-Antartica/e090s70.tar.gz
-SouthAmerica-Antartica/e090s80.tar.gz
-SouthAmerica-Antartica/e090s90.tar.gz
-SouthAmerica-Antartica/e100s70.tar.gz
-SouthAmerica-Antartica/e100s80.tar.gz
-SouthAmerica-Antartica/e100s90.tar.gz
-SouthAmerica-Antartica/e110s70.tar.gz
-SouthAmerica-Antartica/e110s80.tar.gz
-SouthAmerica-Antartica/e110s90.tar.gz
-SouthAmerica-Antartica/e120s70.tar.gz
-SouthAmerica-Antartica/e120s80.tar.gz
-SouthAmerica-Antartica/e120s90.tar.gz
-SouthAmerica-Antartica/e130s70.tar.gz
-SouthAmerica-Antartica/e130s80.tar.gz
-SouthAmerica-Antartica/e130s90.tar.gz
-SouthAmerica-Antartica/e140s70.tar.gz
-SouthAmerica-Antartica/e140s80.tar.gz
-SouthAmerica-Antartica/e140s90.tar.gz
-SouthAmerica-Antartica/e150s70.tar.gz
-SouthAmerica-Antartica/e150s80.tar.gz
-SouthAmerica-Antartica/e150s90.tar.gz
-SouthAmerica-Antartica/e160s70.tar.gz
-SouthAmerica-Antartica/e160s80.tar.gz
-SouthAmerica-Antartica/e160s90.tar.gz
-SouthAmerica-Antartica/e170s80.tar.gz
-SouthAmerica-Antartica/e170s90.tar.gz
-SouthAmerica-Antartica/w010s50.tar.gz
-SouthAmerica-Antartica/w010s60.tar.gz
-SouthAmerica-Antartica/w010s70.tar.gz
-SouthAmerica-Antartica/w010s80.tar.gz
-SouthAmerica-Antartica/w010s90.tar.gz
-SouthAmerica-Antartica/w020s40.tar.gz
-SouthAmerica-Antartica/w020s50.tar.gz
-SouthAmerica-Antartica/w020s80.tar.gz
-SouthAmerica-Antartica/w020s90.tar.gz
-SouthAmerica-Antartica/w030s30.tar.gz
-SouthAmerica-Antartica/w030s60.tar.gz
-SouthAmerica-Antartica/w030s80.tar.gz
-SouthAmerica-Antartica/w030s90.tar.gz
-SouthAmerica-Antartica/w040n30.tar.gz
-SouthAmerica-Antartica/w040s10.tar.gz
-SouthAmerica-Antartica/w040s20.tar.gz
-SouthAmerica-Antartica/w040s60.tar.gz
-SouthAmerica-Antartica/w040s80.tar.gz
-SouthAmerica-Antartica/w040s90.tar.gz
-SouthAmerica-Antartica/w050n00.tar.gz
-SouthAmerica-Antartica/w050s10.tar.gz
-SouthAmerica-Antartica/w050s20.tar.gz
-SouthAmerica-Antartica/w050s30.tar.gz
-SouthAmerica-Antartica/w050s70.tar.gz
-SouthAmerica-Antartica/w050s80.tar.gz
-SouthAmerica-Antartica/w050s90.tar.gz
-SouthAmerica-Antartica/w060n00.tar.gz
-SouthAmerica-Antartica/w060n10.tar.gz
-SouthAmerica-Antartica/w060s10.tar.gz
-SouthAmerica-Antartica/w060s20.tar.gz
-SouthAmerica-Antartica/w060s30.tar.gz
-SouthAmerica-Antartica/w060s40.tar.gz
-SouthAmerica-Antartica/w060s60.tar.gz
-SouthAmerica-Antartica/w060s70.tar.gz
-SouthAmerica-Antartica/w060s80.tar.gz
-SouthAmerica-Antartica/w060s90.tar.gz
-SouthAmerica-Antartica/w070n00.tar.gz
-SouthAmerica-Antartica/w070n10.tar.gz
-SouthAmerica-Antartica/w070s10.tar.gz
-SouthAmerica-Antartica/w070s20.tar.gz
-SouthAmerica-Antartica/w070s30.tar.gz
-SouthAmerica-Antartica/w070s40.tar.gz
-SouthAmerica-Antartica/w070s50.tar.gz
-SouthAmerica-Antartica/w070s60.tar.gz
-SouthAmerica-Antartica/w070s70.tar.gz
-SouthAmerica-Antartica/w070s80.tar.gz
-SouthAmerica-Antartica/w070s90.tar.gz
-SouthAmerica-Antartica/w080n00.tar.gz
-SouthAmerica-Antartica/w080n10.tar.gz
-SouthAmerica-Antartica/w080s10.tar.gz
-SouthAmerica-Antartica/w080s20.tar.gz
-SouthAmerica-Antartica/w080s30.tar.gz
-SouthAmerica-Antartica/w080s40.tar.gz
-SouthAmerica-Antartica/w080s50.tar.gz
-SouthAmerica-Antartica/w080s60.tar.gz
-SouthAmerica-Antartica/w080s70.tar.gz
-SouthAmerica-Antartica/w080s80.tar.gz
-SouthAmerica-Antartica/w080s90.tar.gz
-SouthAmerica-Antartica/w090n00.tar.gz
-SouthAmerica-Antartica/w090s10.tar.gz
-SouthAmerica-Antartica/w090s30.tar.gz
-SouthAmerica-Antartica/w090s40.tar.gz
-SouthAmerica-Antartica/w090s80.tar.gz
-SouthAmerica-Antartica/w090s90.tar.gz
-SouthAmerica-Antartica/w100n00.tar.gz
-SouthAmerica-Antartica/w100s10.tar.gz
-SouthAmerica-Antartica/w100s70.tar.gz
-SouthAmerica-Antartica/w100s80.tar.gz
-SouthAmerica-Antartica/w100s90.tar.gz
-SouthAmerica-Antartica/w110s30.tar.gz
-SouthAmerica-Antartica/w110s80.tar.gz
-SouthAmerica-Antartica/w110s90.tar.gz
-SouthAmerica-Antartica/w120s80.tar.gz
-SouthAmerica-Antartica/w120s90.tar.gz
-SouthAmerica-Antartica/w130s80.tar.gz
-SouthAmerica-Antartica/w130s90.tar.gz
-SouthAmerica-Antartica/w140s80.tar.gz
-SouthAmerica-Antartica/w140s90.tar.gz
-SouthAmerica-Antartica/w150s80.tar.gz
-SouthAmerica-Antartica/w150s90.tar.gz
-SouthAmerica-Antartica/w160s80.tar.gz
-SouthAmerica-Antartica/w160s90.tar.gz
-SouthAmerica-Antartica/w170s80.tar.gz
-SouthAmerica-Antartica/w170s90.tar.gz
-SouthAmerica-Antartica/w180s80.tar.gz
-SouthAmerica-Antartica/w180s90.tar.gz
-USA/w060n40.tar.gz
-USA/w070n40.tar.gz
-USA/w080n20.tar.gz
-USA/w080n30.tar.gz
-USA/w080n40.tar.gz
-USA/w090n20.tar.gz
-USA/w090n30.tar.gz
-USA/w090n40.tar.gz
-USA/w100n20.tar.gz
-USA/w100n30.tar.gz
-USA/w100n40.tar.gz
-USA/w110n20.tar.gz
-USA/w110n30.tar.gz
-USA/w110n40.tar.gz
-USA/w120n20.tar.gz
-USA/w120n30.tar.gz
-USA/w120n40.tar.gz
-USA/w130n30.tar.gz
-USA/w130n40.tar.gz
-USA/w140n50.tar.gz
-USA/w150n50.tar.gz
-USA/w160n10.tar.gz
-USA/w160n20.tar.gz
-USA/w160n50.tar.gz
-USA/w170n10.tar.gz
-USA/w170n20.tar.gz
-USA/w170n50.tar.gz
-USA/w180n50.tar.gz
diff --git a/src/Utils/cdrom/layout-0.9.2 b/src/Utils/cdrom/layout-0.9.2
deleted file mode 100644
index 3e4c98c6..00000000
--- a/src/Utils/cdrom/layout-0.9.2
+++ /dev/null
@@ -1,485 +0,0 @@
-Disk01/w180n00.tar.gz
-Disk01/w180n20.tar.gz
-Disk01/w180n50.tar.gz
-Disk01/w180n60.tar.gz
-Disk01/w180n70.tar.gz
-Disk01/w180n80.tar.gz
-Disk01/w180s10.tar.gz
-Disk01/w180s20.tar.gz
-Disk01/w180s30.tar.gz
-Disk01/w180s40.tar.gz
-Disk01/w180s50.tar.gz
-Disk01/w180s70.tar.gz
-Disk01/w180s80.tar.gz
-Disk01/w180s90.tar.gz
-Disk01/w170n00.tar.gz
-Disk01/w170n10.tar.gz
-Disk01/w170n20.tar.gz
-Disk01/w170n50.tar.gz
-Disk01/w170n60.tar.gz
-Disk01/w170n70.tar.gz
-Disk01/w170n80.tar.gz
-Disk01/w170s10.tar.gz
-Disk01/w170s20.tar.gz
-Disk01/w170s70.tar.gz
-Disk01/w170s80.tar.gz
-Disk01/w170s90.tar.gz
-Disk01/w160n00.tar.gz
-Disk01/w160n10.tar.gz
-Disk01/w160n20.tar.gz
-Disk01/w160n50.tar.gz
-Disk01/w160n60.tar.gz
-Disk01/w160n70.tar.gz
-Disk01/w160n80.tar.gz
-Disk01/w160s10.tar.gz
-Disk01/w160s20.tar.gz
-Disk01/w160s30.tar.gz
-Disk01/w160s70.tar.gz
-Disk01/w160s80.tar.gz
-Disk01/w160s90.tar.gz
-Disk01/w150n10.tar.gz
-Disk01/w150n50.tar.gz
-Disk01/w150n60.tar.gz
-Disk01/w150n70.tar.gz
-Disk01/w150s10.tar.gz
-Disk01/w150s20.tar.gz
-Disk01/w150s30.tar.gz
-Disk01/w150s70.tar.gz
-Disk01/w150s80.tar.gz
-Disk01/w150s90.tar.gz
-Disk01/w140n50.tar.gz
-Disk01/w140n60.tar.gz
-Disk01/w140n70.tar.gz
-Disk01/w140s10.tar.gz
-Disk01/w140s20.tar.gz
-Disk01/w140s30.tar.gz
-Disk01/w140s70.tar.gz
-Disk01/w140s80.tar.gz
-Disk01/w140s90.tar.gz
-Disk01/w130n30.tar.gz
-Disk01/w130n40.tar.gz
-Disk01/w130n50.tar.gz
-Disk01/w130n60.tar.gz
-Disk01/w130n70.tar.gz
-Disk01/w130s20.tar.gz
-Disk01/w130s30.tar.gz
-Disk01/w130s70.tar.gz
-Disk01/w130s80.tar.gz
-Disk01/w120n10.tar.gz
-Disk01/w120n20.tar.gz
-Disk01/w120n30.tar.gz
-Disk01/w120n40.tar.gz
-Disk01/w120n50.tar.gz
-Disk01/w120n60.tar.gz
-Disk01/w120n70.tar.gz
-Disk01/w120s20.tar.gz
-Disk01/w120s70.tar.gz
-Disk01/w120s80.tar.gz
-Disk01/w120s90.tar.gz
-Disk01/w110n10.tar.gz
-Disk01/w110n20.tar.gz
-Disk02/w110n30.tar.gz
-Disk02/w110n40.tar.gz
-Disk02/w110n50.tar.gz
-Disk02/w110n60.tar.gz
-Disk02/w110n70.tar.gz
-Disk02/w110n80.tar.gz
-Disk02/w110s20.tar.gz
-Disk02/w110s30.tar.gz
-Disk02/w110s70.tar.gz
-Disk02/w110s80.tar.gz
-Disk02/w100n00.tar.gz
-Disk02/w100n10.tar.gz
-Disk02/w100n20.tar.gz
-Disk02/w100n30.tar.gz
-Disk02/w100n40.tar.gz
-Disk02/w100n50.tar.gz
-Disk02/w100n60.tar.gz
-Disk02/w100n70.tar.gz
-Disk02/w100n80.tar.gz
-Disk02/w100s10.tar.gz
-Disk02/w100s20.tar.gz
-Disk02/w100s70.tar.gz
-Disk02/w100s80.tar.gz
-Disk02/w090n00.tar.gz
-Disk02/w090n10.tar.gz
-Disk02/w090n20.tar.gz
-Disk02/w090n30.tar.gz
-Disk02/w090n40.tar.gz
-Disk02/w090n50.tar.gz
-Disk02/w090n60.tar.gz
-Disk02/w090n70.tar.gz
-Disk02/w090n80.tar.gz
-Disk02/w090s10.tar.gz
-Disk02/w090s20.tar.gz
-Disk02/w090s30.tar.gz
-Disk02/w090s40.tar.gz
-Disk02/w090s70.tar.gz
-Disk02/w090s80.tar.gz
-Disk02/w090s90.tar.gz
-Disk02/w080n00.tar.gz
-Disk03/w080n10.tar.gz
-Disk03/w080n20.tar.gz
-Disk03/w080n30.tar.gz
-Disk03/w080n40.tar.gz
-Disk03/w080n50.tar.gz
-Disk03/w080n60.tar.gz
-Disk03/w080n70.tar.gz
-Disk03/w080n80.tar.gz
-Disk03/w080s10.tar.gz
-Disk03/w080s20.tar.gz
-Disk03/w080s30.tar.gz
-Disk03/w080s40.tar.gz
-Disk03/w080s50.tar.gz
-Disk03/w080s60.tar.gz
-Disk03/w080s70.tar.gz
-Disk03/w080s80.tar.gz
-Disk03/w080s90.tar.gz
-Disk03/w070n00.tar.gz
-Disk03/w070n10.tar.gz
-Disk03/w070n30.tar.gz
-Disk03/w070n40.tar.gz
-Disk03/w070n50.tar.gz
-Disk03/w070n60.tar.gz
-Disk03/w070n70.tar.gz
-Disk03/w070n80.tar.gz
-Disk03/w070s10.tar.gz
-Disk03/w070s20.tar.gz
-Disk04/w070s30.tar.gz
-Disk04/w070s40.tar.gz
-Disk04/w070s50.tar.gz
-Disk04/w070s60.tar.gz
-Disk04/w070s70.tar.gz
-Disk04/w070s80.tar.gz
-Disk04/w060n00.tar.gz
-Disk04/w060n10.tar.gz
-Disk04/w060n40.tar.gz
-Disk04/w060n50.tar.gz
-Disk04/w060n60.tar.gz
-Disk04/w060n70.tar.gz
-Disk04/w060n80.tar.gz
-Disk04/w060s10.tar.gz
-Disk04/w060s20.tar.gz
-Disk04/w060s30.tar.gz
-Disk04/w060s40.tar.gz
-Disk04/w060s60.tar.gz
-Disk04/w060s70.tar.gz
-Disk04/w060s80.tar.gz
-Disk04/w050n00.tar.gz
-Disk04/w050n50.tar.gz
-Disk04/w050n60.tar.gz
-Disk04/w050n70.tar.gz
-Disk04/w050n80.tar.gz
-Disk04/w050s10.tar.gz
-Disk04/w050s20.tar.gz
-Disk04/w050s30.tar.gz
-Disk04/w050s60.tar.gz
-Disk04/w050s70.tar.gz
-Disk04/w050s80.tar.gz
-Disk04/w040n30.tar.gz
-Disk04/w040n60.tar.gz
-Disk04/w040n70.tar.gz
-Disk04/w040n80.tar.gz
-Disk04/w040s10.tar.gz
-Disk04/w040s20.tar.gz
-Disk04/w040s60.tar.gz
-Disk04/w040s70.tar.gz
-Disk04/w040s80.tar.gz
-Disk04/w030n10.tar.gz
-Disk04/w030n30.tar.gz
-Disk04/w030n60.tar.gz
-Disk04/w030n70.tar.gz
-Disk04/w030n80.tar.gz
-Disk04/w030s20.tar.gz
-Disk04/w030s30.tar.gz
-Disk04/w030s60.tar.gz
-Disk04/w030s70.tar.gz
-Disk04/w030s80.tar.gz
-Disk04/w020n00.tar.gz
-Disk04/w020n10.tar.gz
-Disk04/w020n20.tar.gz
-Disk04/w020n30.tar.gz
-Disk04/w020n50.tar.gz
-Disk04/w020n60.tar.gz
-Disk04/w020n70.tar.gz
-Disk04/w020n80.tar.gz
-Disk04/w020s10.tar.gz
-Disk04/w020s20.tar.gz
-Disk04/w020s40.tar.gz
-Disk04/w020s50.tar.gz
-Disk04/w020s60.tar.gz
-Disk04/w020s70.tar.gz
-Disk04/w020s80.tar.gz
-Disk04/w020s90.tar.gz
-Disk05/w010n00.tar.gz
-Disk05/w010n10.tar.gz
-Disk05/w010n20.tar.gz
-Disk05/w010n30.tar.gz
-Disk05/w010n40.tar.gz
-Disk05/w010n50.tar.gz
-Disk05/w010n60.tar.gz
-Disk05/w010n70.tar.gz
-Disk05/w010s20.tar.gz
-Disk05/w010s50.tar.gz
-Disk05/w010s60.tar.gz
-Disk05/w010s70.tar.gz
-Disk05/w010s80.tar.gz
-Disk05/w010s90.tar.gz
-Disk05/e000n00.tar.gz
-Disk05/e000n10.tar.gz
-Disk05/e000n20.tar.gz
-Disk05/e000n30.tar.gz
-Disk05/e000n40.tar.gz
-Disk05/e000n50.tar.gz
-Disk05/e000n60.tar.gz
-Disk05/e000n70.tar.gz
-Disk05/e000n80.tar.gz
-Disk05/e000s10.tar.gz
-Disk05/e000s20.tar.gz
-Disk05/e000s60.tar.gz
-Disk05/e000s70.tar.gz
-Disk05/e000s80.tar.gz
-Disk05/e000s90.tar.gz
-Disk05/e010n00.tar.gz
-Disk05/e010n10.tar.gz
-Disk05/e010n20.tar.gz
-Disk05/e010n30.tar.gz
-Disk05/e010n40.tar.gz
-Disk05/e010n50.tar.gz
-Disk06/e010n60.tar.gz
-Disk06/e010n70.tar.gz
-Disk06/e010n80.tar.gz
-Disk06/e010s10.tar.gz
-Disk06/e010s20.tar.gz
-Disk06/e010s30.tar.gz
-Disk06/e010s40.tar.gz
-Disk06/e010s60.tar.gz
-Disk06/e010s70.tar.gz
-Disk06/e010s80.tar.gz
-Disk06/e020n00.tar.gz
-Disk06/e020n10.tar.gz
-Disk06/e020n20.tar.gz
-Disk06/e020n30.tar.gz
-Disk06/e020n40.tar.gz
-Disk06/e020n50.tar.gz
-Disk06/e020n60.tar.gz
-Disk06/e020n70.tar.gz
-Disk06/e020n80.tar.gz
-Disk06/e020s10.tar.gz
-Disk06/e020s20.tar.gz
-Disk06/e020s30.tar.gz
-Disk06/e020s40.tar.gz
-Disk06/e020s60.tar.gz
-Disk06/e020s70.tar.gz
-Disk06/e020s80.tar.gz
-Disk06/e030n00.tar.gz
-Disk06/e030n10.tar.gz
-Disk06/e030n20.tar.gz
-Disk07/e030n30.tar.gz
-Disk07/e030n40.tar.gz
-Disk07/e030n50.tar.gz
-Disk07/e030n60.tar.gz
-Disk07/e030n70.tar.gz
-Disk07/e030n80.tar.gz
-Disk07/e030s10.tar.gz
-Disk07/e030s20.tar.gz
-Disk07/e030s30.tar.gz
-Disk07/e030s40.tar.gz
-Disk07/e030s50.tar.gz
-Disk07/e030s60.tar.gz
-Disk07/e030s70.tar.gz
-Disk07/e030s80.tar.gz
-Disk07/e040n00.tar.gz
-Disk07/e040n10.tar.gz
-Disk07/e040n20.tar.gz
-Disk07/e040n30.tar.gz
-Disk07/e040n40.tar.gz
-Disk07/e040n50.tar.gz
-Disk07/e040n60.tar.gz
-Disk07/e040n70.tar.gz
-Disk07/e040n80.tar.gz
-Disk07/e040s10.tar.gz
-Disk07/e040s20.tar.gz
-Disk07/e040s30.tar.gz
-Disk07/e040s60.tar.gz
-Disk07/e040s70.tar.gz
-Disk07/e040s80.tar.gz
-Disk07/e050n00.tar.gz
-Disk07/e050n10.tar.gz
-Disk07/e050n20.tar.gz
-Disk07/e050n30.tar.gz
-Disk07/e050n40.tar.gz
-Disk08/e050n50.tar.gz
-Disk08/e050n60.tar.gz
-Disk08/e050n70.tar.gz
-Disk08/e050n80.tar.gz
-Disk08/e050s10.tar.gz
-Disk08/e050s20.tar.gz
-Disk08/e050s30.tar.gz
-Disk08/e050s50.tar.gz
-Disk08/e050s60.tar.gz
-Disk08/e050s70.tar.gz
-Disk08/e050s80.tar.gz
-Disk08/e050s90.tar.gz
-Disk08/e060n20.tar.gz
-Disk08/e060n30.tar.gz
-Disk08/e060n40.tar.gz
-Disk08/e060n50.tar.gz
-Disk08/e060n60.tar.gz
-Disk08/e060n70.tar.gz
-Disk08/e060n80.tar.gz
-Disk08/e060s20.tar.gz
-Disk08/e060s50.tar.gz
-Disk08/e060s60.tar.gz
-Disk08/e060s70.tar.gz
-Disk08/e060s80.tar.gz
-Disk08/e070n00.tar.gz
-Disk08/e070n10.tar.gz
-Disk08/e070n20.tar.gz
-Disk08/e070n30.tar.gz
-Disk08/e070n40.tar.gz
-Disk08/e070n50.tar.gz
-Disk08/e070n60.tar.gz
-Disk08/e070n70.tar.gz
-Disk08/e070n80.tar.gz
-Disk08/e070s10.tar.gz
-Disk08/e070s20.tar.gz
-Disk08/e070s40.tar.gz
-Disk08/e070s50.tar.gz
-Disk08/e070s60.tar.gz
-Disk08/e070s70.tar.gz
-Disk08/e070s80.tar.gz
-Disk08/e080n00.tar.gz
-Disk08/e080n10.tar.gz
-Disk08/e080n20.tar.gz
-Disk08/e080n30.tar.gz
-Disk08/e080n40.tar.gz
-Disk08/e080n50.tar.gz
-Disk09/e080n60.tar.gz
-Disk09/e080n70.tar.gz
-Disk09/e080n80.tar.gz
-Disk09/e080s20.tar.gz
-Disk09/e080s60.tar.gz
-Disk09/e080s70.tar.gz
-Disk09/e080s80.tar.gz
-Disk09/e090n00.tar.gz
-Disk09/e090n10.tar.gz
-Disk09/e090n20.tar.gz
-Disk09/e090n30.tar.gz
-Disk09/e090n40.tar.gz
-Disk09/e090n50.tar.gz
-Disk09/e090n60.tar.gz
-Disk09/e090n70.tar.gz
-Disk09/e090n80.tar.gz
-Disk09/e090s10.tar.gz
-Disk09/e090s20.tar.gz
-Disk09/e090s60.tar.gz
-Disk09/e090s70.tar.gz
-Disk09/e090s80.tar.gz
-Disk09/e100n00.tar.gz
-Disk09/e100n10.tar.gz
-Disk09/e100n20.tar.gz
-Disk09/e100n30.tar.gz
-Disk09/e100n40.tar.gz
-Disk09/e100n50.tar.gz
-Disk09/e100n60.tar.gz
-Disk10/e100n70.tar.gz
-Disk10/e100n80.tar.gz
-Disk10/e100s10.tar.gz
-Disk10/e100s20.tar.gz
-Disk10/e100s70.tar.gz
-Disk10/e100s80.tar.gz
-Disk10/e110n00.tar.gz
-Disk10/e110n10.tar.gz
-Disk10/e110n20.tar.gz
-Disk10/e110n30.tar.gz
-Disk10/e110n40.tar.gz
-Disk10/e110n50.tar.gz
-Disk10/e110n60.tar.gz
-Disk10/e110n70.tar.gz
-Disk10/e110s10.tar.gz
-Disk10/e110s20.tar.gz
-Disk10/e110s30.tar.gz
-Disk10/e110s40.tar.gz
-Disk10/e110s70.tar.gz
-Disk10/e110s80.tar.gz
-Disk10/e120n00.tar.gz
-Disk10/e120n10.tar.gz
-Disk10/e120n20.tar.gz
-Disk10/e120n30.tar.gz
-Disk10/e120n40.tar.gz
-Disk10/e120n50.tar.gz
-Disk10/e120n60.tar.gz
-Disk10/e120n70.tar.gz
-Disk10/e120s10.tar.gz
-Disk10/e120s20.tar.gz
-Disk10/e120s30.tar.gz
-Disk10/e120s40.tar.gz
-Disk10/e120s70.tar.gz
-Disk10/e120s80.tar.gz
-Disk10/e130n00.tar.gz
-Disk10/e130n10.tar.gz
-Disk10/e130n20.tar.gz
-Disk10/e130n30.tar.gz
-Disk11/e130n40.tar.gz
-Disk11/e130n50.tar.gz
-Disk11/e130n60.tar.gz
-Disk11/e130n70.tar.gz
-Disk11/e130s10.tar.gz
-Disk11/e130s20.tar.gz
-Disk11/e130s30.tar.gz
-Disk11/e130s40.tar.gz
-Disk11/e130s70.tar.gz
-Disk11/e130s80.tar.gz
-Disk11/e140n00.tar.gz
-Disk11/e140n10.tar.gz
-Disk11/e140n20.tar.gz
-Disk11/e140n30.tar.gz
-Disk11/e140n40.tar.gz
-Disk11/e140n50.tar.gz
-Disk11/e140n60.tar.gz
-Disk11/e140n70.tar.gz
-Disk11/e140s10.tar.gz
-Disk11/e140s20.tar.gz
-Disk11/e140s30.tar.gz
-Disk11/e140s40.tar.gz
-Disk11/e140s50.tar.gz
-Disk11/e140s70.tar.gz
-Disk11/e140s80.tar.gz
-Disk11/e150n00.tar.gz
-Disk11/e150n20.tar.gz
-Disk11/e150n40.tar.gz
-Disk11/e150n50.tar.gz
-Disk11/e150n60.tar.gz
-Disk11/e150n70.tar.gz
-Disk11/e150s10.tar.gz
-Disk11/e150s20.tar.gz
-Disk11/e150s30.tar.gz
-Disk11/e150s40.tar.gz
-Disk11/e150s60.tar.gz
-Disk11/e150s70.tar.gz
-Disk11/e150s80.tar.gz
-Disk11/e160n00.tar.gz
-Disk11/e160n10.tar.gz
-Disk11/e160n50.tar.gz
-Disk11/e160n60.tar.gz
-Disk11/e160n70.tar.gz
-Disk11/e160s10.tar.gz
-Disk11/e160s20.tar.gz
-Disk11/e160s30.tar.gz
-Disk11/e160s50.tar.gz
-Disk11/e160s60.tar.gz
-Disk11/e160s70.tar.gz
-Disk11/e160s80.tar.gz
-Disk11/e170n00.tar.gz
-Disk11/e170n10.tar.gz
-Disk11/e170n50.tar.gz
-Disk11/e170n60.tar.gz
-Disk11/e170n70.tar.gz
-Disk11/e170s10.tar.gz
-Disk11/e170s20.tar.gz
-Disk11/e170s30.tar.gz
-Disk11/e170s40.tar.gz
-Disk11/e170s50.tar.gz
-Disk11/e170s70.tar.gz
-Disk11/e170s80.tar.gz
\ No newline at end of file
diff --git a/src/Utils/cdrom/make-cd-image b/src/Utils/cdrom/make-cdrom-image
similarity index 98%
rename from src/Utils/cdrom/make-cd-image
rename to src/Utils/cdrom/make-cdrom-image
index 063e39b0..507f9636 100755
--- a/src/Utils/cdrom/make-cd-image
+++ b/src/Utils/cdrom/make-cdrom-image
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=0.9.2
+VERSION=0.9.5
 SOURCE=$1
 VOLUME_ID=FG_Scenery_${SOURCE}_v${VERSION}
 PUBLISHER=curt@flightgear.org
diff --git a/src/Utils/cdrom/make-dvd-image b/src/Utils/cdrom/make-dvd-image
new file mode 100755
index 00000000..3ba02eb4
--- /dev/null
+++ b/src/Utils/cdrom/make-dvd-image
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+VERSION=0.9.5
+SOURCE=$1
+VOLUME_ID=FG_Scenery_${SOURCE}_v${VERSION}
+PUBLISHER=curt@flightgear.org
+PREPAIRER=curt@flightgear.org
+# COPYRIGHT="Copyright (C) 2002  Curtis L. Olson"
+OUTPUT_IMG=/data1/images/${SOURCE}-${VERSION}.img
+
+# -f = follow symbolic links (the image directories are link trees)
+# -r = Rock Ridge protocol
+# -J -jcharset default = Joliet extensions
+# -l = allow full 31 character filenames
+# -D = do not use deep directory relocation
+# -L = allow IOS9660 filenames to begin with a period
+# -apple = Add Apple extensions.
+# -probe = Test each file for it's Mac creator/type
+
+OPTIONS="-f -r -J -jcharset default -l -D -L"
+
+# COMMAND="mkisofs $OPTIONS -V $VOLUME_ID -P $PUBLISHER -p $PREPAIRER \
+#         -apple -probe -split-output \
+#         -o $OUTPUT_IMG $SOURCE"
+COMMAND="mkisofs $OPTIONS -V $VOLUME_ID -P $PUBLISHER -p $PREPAIRER \
+	-apple -probe \
+        -o $OUTPUT_IMG $SOURCE"
+
+echo running:
+echo $COMMAND
+$COMMAND
+
+echo 
+echo "To examine the image before burning a cd:"
+echo
+echo "mount $OUTPUT_IMG /mnt -t iso9660 -o loop=/dev/loop3,blocksize=1024"
diff --git a/src/Utils/cdrom/mk-mklayout-script.pl b/src/Utils/cdrom/mk-mklayout-script.pl
index cf584f2e..43f0ee35 100755
--- a/src/Utils/cdrom/mk-mklayout-script.pl
+++ b/src/Utils/cdrom/mk-mklayout-script.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 
-$source = "/stage/fgfs03/curt/Scenery-0.9.2";
+$source = "/stage/fgfs03/curt/Scenery-0.9.5";
 
 $layout_master = shift( @ARGV );
 $dest = shift( @ARGV );
 
 if ( $layout_master eq "" ) {
-    $layout_master = "./layout-disks-0.9.2";
+    $layout_master = "./layout-disks-0.9.5";
 }
 if ( $dest eq "" ) {
     $dest = "./Images";
diff --git a/src/Utils/cdrom/sum-new-sizes.pl b/src/Utils/cdrom/sum-new-sizes.pl
index c88acfa5..9b4c191c 100755
--- a/src/Utils/cdrom/sum-new-sizes.pl
+++ b/src/Utils/cdrom/sum-new-sizes.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$tgzdir = "/stage/fgfs03/curt/Scenery-0.9.2";
+$tgzdir = "/stage/fgfs03/curt/Scenery-0.9.5";
 
 if ( $#ARGV < 0 ) {
     die "usage: $0 <layout_dir>\n";
diff --git a/src/Utils/download-map/download-map.pl b/src/Utils/download-map/download-map.pl
index 2c4d0fc6..206865e6 100755
--- a/src/Utils/download-map/download-map.pl
+++ b/src/Utils/download-map/download-map.pl
@@ -2,7 +2,7 @@
 
 use GD;
 
-$version = "0.9.2";
+$version = "0.9.5";
 if ( $#ARGV < 0 ) {
     push( @ARGV, "/stage/fgfs01/ftp/pub/fgfs/Scenery-" . $version );
 }