diff --git a/pandatool/src/scripts/basedlls.pl b/pandatool/src/scripts/basedlls.pl
index 1409746264..74a54a540d 100755
--- a/pandatool/src/scripts/basedlls.pl
+++ b/pandatool/src/scripts/basedlls.pl
@@ -10,7 +10,6 @@ $archive_root="\\\\dimbo\\panda\\win\\";
 #edit this to where rebase.exe is on your machine, must be cygwin-style path for cygwin perl
 $rebase_path="/msvc7/Common7/Tools/bin";
 $ENV{'PATH'}=$rebase_path.":".$ENV{'PATH'};
-print $ENV{'PATH'},"\n";
 
 # note: this is the order dlls will be laid out in memory
 @dll_names=("libpanda","libpandadx","libpandadx7","libpandagl","libpandaexpress","libpandaphysics","libpandafx","libdtool","libdtoolconfig","libpystub","libdirect","libtoontown","libmiles_audio","libpandaegg");
@@ -97,11 +96,12 @@ $argstr="-v -b $baseaddr -c $dllbasefile -l $basedlllogfilename $dll_names_dbg";
 print $args[0]."\n";
 system(@args);
 
+#cygwin d2u seems to not work rite
+$d2u_path=$ENV{'HOME'}."/player/wintools/bin";
+$ENV{'PATH'}=$d2u_path.":".$ENV{'PATH'};
+print $ENV{'PATH'},"\n";
 @args=("dos2unix",$dllbasefile);
 print $args[0]." ".$args[1]." ".$args[2]."\n";
 system(@args);
 
-
 exit(0);
-
-
diff --git a/pandatool/src/scripts/builder.pl b/pandatool/src/scripts/builder.pl
index 1a92906867..6c825ef171 100755
--- a/pandatool/src/scripts/builder.pl
+++ b/pandatool/src/scripts/builder.pl
@@ -44,6 +44,7 @@ my $VC7_BINDIRS="/msvc7/Vc7/bin".$DIRPATH_SEPARATOR."/msvc7/Common7/Tools/Bin".$
 $ENV{'WINTOOLS'} = '/home/builder/player/wintools';
 #$ENV{'PPREMAKE_CONFIG'} = '/usr/local/etc/Config.pp';  old location
 $ENV{'PPREMAKE_CONFIG'} = $ENV{'WINTOOLS'}.'/panda/etc/Config.pp';
+$ENV{'PPREMAKE_PLATFORM'} = 'Win32';  # generate OptX-Win32 dirs instead of OptX-Cygwin
 $ENV{'TCSH_NO_CSHRC_CHDIR'}='1';
 $ENV{'ENABLE_PROFILING'}='1';    # generate .map files