diff --git a/src/Airports/GenAirports850/airport.cxx b/src/Airports/GenAirports850/airport.cxx
index 474101b0..e506ffee 100644
--- a/src/Airports/GenAirports850/airport.cxx
+++ b/src/Airports/GenAirports850/airport.cxx
@@ -1237,5 +1237,5 @@ void Airport::BuildBtg(const std::string& root, const string_list& elev_src )
 
     chopper.Add( divided_base, "Hole" );
     chopper.Add( apt_clearing, "Airport" );
-    chopper.Save();
+    chopper.Save( false );
 }
diff --git a/src/Lib/terragear/tg_chopper.cxx b/src/Lib/terragear/tg_chopper.cxx
index 10c41724..cd5b3b3d 100644
--- a/src/Lib/terragear/tg_chopper.cxx
+++ b/src/Lib/terragear/tg_chopper.cxx
@@ -214,17 +214,22 @@ long int tgChopper::GenerateIndex( std::string path )
     return index;
 }
 
-void tgChopper::Save( void )
+void tgChopper::Save( bool DebugShapefiles )
 {
     // traverse the bucket list
     bucket_polys_map_interator it;
     char tile_name[16];
     char poly_ext[16];
 
+    char layer[32];
+    char ds_name[64];
+
     for (it=bp_map.begin(); it != bp_map.end(); it++) {
         SGBucket b( (*it).first );
         tgpolygon_list const& polys = (*it).second;
 
+        sprintf(ds_name, "./bucket_%s", b.gen_index_str().c_str() );
+
         std::string path = root_path + "/" + b.gen_base_path();
         sprintf( tile_name, "%ld", b.gen_index() );
 
@@ -248,6 +253,12 @@ void tgChopper::Save( void )
         sgWriteUInt( fp, polys.size() );
         for ( unsigned int i=0; i<polys.size(); i++ ) {
             polys[i].SaveToGzFile( fp );
+
+            if ( DebugShapefiles )
+            {
+                sprintf(layer, "poly_%s-%d", b.gen_index_str().c_str(), i );
+                tgShapefile::FromPolygon( polys[i], ds_name, layer, "poly" );
+            }
         }
 
         gzclose( fp );
diff --git a/src/Lib/terragear/tg_chopper.hxx b/src/Lib/terragear/tg_chopper.hxx
index 3c526ff5..47546192 100644
--- a/src/Lib/terragear/tg_chopper.hxx
+++ b/src/Lib/terragear/tg_chopper.hxx
@@ -14,7 +14,7 @@ public:
     }
 
     void Add( const tgPolygon& poly, const std::string& type );
-    void Save( void );
+    void Save( bool DebugShapes );
 
 private:
     long int GenerateIndex( std::string path );
diff --git a/src/Prep/OGRDecode/ogr-decode.cxx b/src/Prep/OGRDecode/ogr-decode.cxx
index eaa8cef3..15bcd052 100644
--- a/src/Prep/OGRDecode/ogr-decode.cxx
+++ b/src/Prep/OGRDecode/ogr-decode.cxx
@@ -685,7 +685,7 @@ int main( int argc, char **argv ) {
     OGRDataSource::DestroyDataSource( poDS );
 
     SG_LOG(SG_GENERAL, SG_ALERT, "Saving to buckets");
-    results.Save();
+    results.Save( save_shapefiles );
 
     return 0;
 }