diff --git a/src/Airports/GenAirports/main.cxx b/src/Airports/GenAirports/main.cxx
index ac1d3bc3..5876747e 100644
--- a/src/Airports/GenAirports/main.cxx
+++ b/src/Airports/GenAirports/main.cxx
@@ -222,15 +222,16 @@ int main( int argc, char **argv ) {
     }
 
     // make work directory
+    string airportareadir=work_dir+"/AirportArea";
 #ifdef _MSC_VER
-    fg_mkdir( work_dir.c_str() );
+    fg_mkdir( airportareadir.c_str() );
 #else
-    string command = "mkdir -p " + work_dir;
+    string command = "mkdir -p " + airportareadir;
     system( command.c_str() );
 #endif
 
     // initialize persistant polygon counter
-    string counter_file = work_dir + "/poly_counter";
+    string counter_file = airportareadir+"/poly_counter";
     poly_index_init( counter_file );
 
     sg_gzifstream in( input_file );
diff --git a/src/Prep/OGRDecode/ogr-decode.cxx b/src/Prep/OGRDecode/ogr-decode.cxx
index 1936d280..3ce7fb10 100644
--- a/src/Prep/OGRDecode/ogr-decode.cxx
+++ b/src/Prep/OGRDecode/ogr-decode.cxx
@@ -495,7 +495,7 @@ int main( int argc, char **argv ) {
 #endif
 
     // initialize persistant polygon counter
-    string counter_file = work_dir + "/../poly_counter";
+    string counter_file = work_dir + "/poly_counter";
     poly_index_init( counter_file );
 
     SG_LOG( SG_GENERAL, SG_DEBUG, "Opening datasource " << datasource << " for reading." );