diff --git a/Makefile.am b/Makefile.am
index 90e439dc..0369b2a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,4 +7,4 @@ EXTRA_DIST = \
 SUBDIRS = src
 
 dist-hook:
-	(cd $(top_srcdir); $(HOME)/projects/FlightGear-0.9/admin/am2dsp.pl)
+	(cd $(top_srcdir); $(HOME)/Projects/FlightGear-0.9/admin/am2dsp.pl)
diff --git a/NEWS b/NEWS
index 37baf0ad..0fa31e18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+New in 0.9.8
+* January 11, 2005
+
+* World builder:
+  - fixed a logical bug in the routine that strips out holes from a
+    multi-contour polygon
+
+* Airport generator:
+  - fixed a bug that caused threshold lighting to be omitted in some
+    situations.
+  - add airport surface bases for towers, windsocks, and beacons so
+    these are never floating or buried.
+  - much improved airport surface smoothing and fitting via a least
+    squares nurbs approximation.
+  - directly support Robin Peel's airport database format.
+  - fix a bug that could put the same airport object in the final .stg
+    file twice.  This never affected rendering, but could
+    significantly impact performance.  This bug has been around for a
+    while and we just noticed it now.  Dohhh!
+
+
 New in 0.9.5
 * July 30, 2004
 
diff --git a/configure.ac b/configure.ac
index 28c28ce9..3c2f9b92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,5 @@
 dnl Process this file with aclocal ; automake -a ; autoconf to produce a 
 dnl working configure script.
-dnl
-dnl $Id$
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/Lib/DEM/dem.cxx])
@@ -10,7 +8,7 @@ AC_CONFIG_SRCDIR([src/Lib/DEM/dem.cxx])
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(TerraGear, 0.9.5)
+AM_INIT_AUTOMAKE(TerraGear, 0.9.8)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -322,7 +320,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 6
+#define MIN_MICRO 8
 
 int main() {
     int major, minor, micro;
diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx
index 4682ae78..b649797f 100644
--- a/src/BuildTiles/Main/main.cxx
+++ b/src/BuildTiles/Main/main.cxx
@@ -1195,11 +1195,14 @@ int main(int argc, char **argv) {
 
     cout << "Output directory is " << output_dir << endl;
     cout << "Working directory is " << work_dir << endl;
-    cout << "Tile id is " << tile_id << endl;
-    cout << "Center longitude is " << lon << endl;
-    cout << "Center latitude is " << lat << endl;
-    cout << "X distance is " << xdist << endl;
-    cout << "Y distance is " << ydist << endl;
+    if ( tile_id > 0 ) {
+        cout << "Tile id is " << tile_id << endl;
+    } else {
+        cout << "Center longitude is " << lon << endl;
+        cout << "Center latitude is " << lat << endl;
+        cout << "X distance is " << xdist << endl;
+        cout << "Y distance is " << ydist << endl;
+    }
     for (int i = arg_pos; i < argc; i++) {
 	load_dirs.push_back(argv[i]);
 	cout << "Load directory: " << argv[i] << endl;
diff --git a/src/BuildTiles/Parallel/fgfs-launch-clients b/src/BuildTiles/Parallel/fgfs-launch-clients
index bd1807a7..a329d9b6 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.6"
+    OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.7"
     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 c48eeaf9..0782ba3a 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.6"
+    OUTPUT_DIR="${BASE_DIR}/Scenery-0.9.7"
     MASTER_ON="${WORK_BASE}/Status/MASTER_ON"
     LOG_DIR="${WORK_BASE}/Status"
     LOG_FILE="${LOG_DIR}/server.log"
diff --git a/src/Prep/Tower/tower.pl b/src/Prep/Tower/tower.pl
index 727d56e7..1a307716 100755
--- a/src/Prep/Tower/tower.pl
+++ b/src/Prep/Tower/tower.pl
@@ -7,9 +7,10 @@ require "calc-tile.pl";
 my( $arg );
 my( $infile ) = "";
 my( $outdir ) = "";
+my( $countonly ) = 0;
 
 sub usage {
-    die "Usage: $0 --input=<infile> --outdir=<output_dir_tree>\n";
+    die "Usage: $0 --input=<infile> --outdir=<output_dir_tree> --count-only\n";
 }
 
 
@@ -23,12 +24,14 @@ while( $arg = shift(@ARGV) ) {
         $arg =~ s/^--outdir=//;
         $outdir = $arg;
         print "outdir = $outdir\n";
+    } elsif ( $arg =~ m/^--count-only/ ) {
+        $countonly = 1;
     } else {
         usage();
     }
 }
 
-if ( $infile eq "" || $outdir eq "" ) {
+if ( $infile eq "" || ($countonly == 0 && $outdir eq "") ) {
     usage();
 }
 
@@ -86,18 +89,18 @@ while( <IN> ) {
     my( $model ) = "";
     my( $base_elev ) = 0.0;
 
-    if ( $height < 50.0 ) {
+    if ( $height < 100.0 ) {
         # short tower
         $model = "Models/Structures/radio-short.xml";
-        $base_elev = $top_msl - 50.0;
+        $base_elev = $top_msl - 100.0;
         $shortcount++;
 
         # but let's skip because too many of these just get too crazy
         next;
-    } elsif ( $height < 100.0 ) {
+    } elsif ( $height < 200.0 ) {
         # medium tower
         $model = "Models/Structures/radio-medium.xml";
-        $base_elev = $top_msl - 100.0;
+        $base_elev = $top_msl - 200.0;
         $mediumcount++;
     } else {
         # tall tower
@@ -108,14 +111,16 @@ while( <IN> ) {
 
     # printf("%11.6f %10.6f %.1f %.1f %.1f \n",
     #        $lon, $lat, $ground, $height, $top_msl);
-    printf(" %s/%s/%s.ind -> OBJECT_SHARED %s %.6f %.6f %.1f 0.00\n", $outdir, $dir, $index, $model, $lon, $lat, $base_elev );
+    # printf(" %s/%s/%s.ind -> OBJECT_SHARED %s %.6f %.6f %.1f 0.00\n", $outdir, $dir, $index, $model, $lon, $lat, $base_elev );
 
-    system( "mkdir -p $outdir/$dir" );
+    if ( ! $countonly ) {
+        system( "mkdir -p $outdir/$dir" );
     
-    my( $indfile ) = "$outdir/$dir/$index.ind";
-    open( INDEX, ">>$indfile" );
-    printf( INDEX "OBJECT_SHARED %s %.6f %.6f %.1f 0.00\n",
-            $model, $lon, $lat, $base_elev );
+        my( $indfile ) = "$outdir/$dir/$index.ind";
+        open( INDEX, ">>$indfile" );
+        printf( INDEX "OBJECT_SHARED %s %.6f %.6f %.1f 0.00\n",
+                $model, $lon, $lat, $base_elev );
+    }
 }
 
 print "short count = $shortcount\n";
diff --git a/src/Utils/cdrom/Makefile.am b/src/Utils/cdrom/Makefile.am
index 9cceecc6..a515abeb 100644
--- a/src/Utils/cdrom/Makefile.am
+++ b/src/Utils/cdrom/Makefile.am
@@ -1 +1,6 @@
-EXTRA_DIST = mk-mklayout-script.pl sum-new-sizes.pl
+EXTRA_DIST = \
+	1-gen-layout-map.pl \
+	2-make-layout-link-tree.pl \
+	3-make-cdrom-image \
+	3-make-dvd-image \
+	sum-new-sizes.pl
diff --git a/src/Utils/download-map/download-map.pl b/src/Utils/download-map/download-map.pl
index 206865e6..9a1705e2 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.5";
+$version = "0.9.7";
 if ( $#ARGV < 0 ) {
     push( @ARGV, "/stage/fgfs01/ftp/pub/fgfs/Scenery-" . $version );
 }
@@ -71,7 +71,7 @@ print HTML "<MAP NAME=\"map\">\n";
 
 $toggle = 0;
 foreach $dir ( @ARGV ) {
-    @files = `ls $dir/*.tar.gz`;
+    @files = `ls $dir/*.tgz`;
 
     foreach $file ( @files ) {
         chop($file);
@@ -115,7 +115,7 @@ foreach $dir ( @ARGV ) {
         }
 
         $file =~ s/.*\///g;
-        $file =~ s/.tar.gz//;
+        $file =~ s/.tgz//;
         # print "$file\n";
         ($ew, $lon, $ns, $lat) = $file =~ m/(\w)(\d\d\d)(\w)(\d\d)/;
         # print "$ew $lon, $ns, $lat\n";
@@ -145,7 +145,7 @@ foreach $dir ( @ARGV ) {
         # $y1 = $height - $y1;
         # $y2 = $height - $y2;
         print HTML "<AREA SHAPE=rect COORDS=$x1,$y2,$x2,$y1 ";
-        print HTML "HREF=$ftpurl/$file.tar.gz ";
+        print HTML "HREF=$ftpurl/$file.tgz ";
         printf(HTML "ALT=\"%s  %.2f Mb  $date\">\n", $file, $mb);
     }