diff --git a/scripts/packageBinaries.pl b/scripts/packageBinaries.pl
index dfb5812f6802fe8ee830e49061a1e58763512e48..025ba81c7260f10e88f9959776241700590fb39d 100644
--- a/scripts/packageBinaries.pl
+++ b/scripts/packageBinaries.pl
@@ -412,9 +412,10 @@ if ($platform eq "win64bit" )
 #     End of Itanium Builds.
 
 #
-#   WINDOWS builds happen here ...
+#   WINDOWS builds happen here, as long as they
+#     aren't using gcc...
 #
-if ($platform =~ m/Windows/  || $platform =~ m/CYGWIN/) {
+if ($platform =~ m/Windows/  || ($platform =~ m/CYGWIN/ && !($opt_c =~ m/gcc/))) {
 
     if ($opt_b eq "64")
     {
@@ -819,7 +820,7 @@ if ($platform =~ m/Windows/  || $platform =~ m/CYGWIN/) {
 #
 if ( ($platform =~ m/AIX/i)   || ($platform =~ m/HP-UX/i) || ($platform =~ m/BeOS/i) ||
      ($platform =~ m/SunOS/i) || ($platform =~ m/Linux/i) || ($platform =~ m/ptx/i) ||
-	 ($platform =~ m/Darwin/i) ) {
+	 ($platform =~ m/Darwin/i)  || ($platform =~ m/CYGWIN/ && ($opt_c =~ m/gcc/))) {
 
     # Echo the current PATH to see what compiler it picks up
     psystem ("echo PATH=$ENV{'PATH'}");
@@ -954,6 +955,10 @@ if ( ($platform =~ m/AIX/i)   || ($platform =~ m/HP-UX/i) || ($platform =~ m/BeO
         }
         $XMLINSTALL = $ENV{'XMLINSTALL'};
     }
+    if(($platform =~ m/CYGWIN/) && ($opt_c =~ m/gcc/)) {
+        $MAKE = "make";
+        $platform = "CYGWIN";
+    }
 
     # Set defaults for platform-independent options.
     if ($opt_m eq "")	{$opt_m = "inmem"; }   # In memory  message loader.