diff --git a/CHANGES b/CHANGES
index 35d94f057af62b5586bb7216551a66cc62e225bb..3d052f499803996093364636cb3dd58a6e0ca555 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,7 @@
   *) Add config entry for Linux on MIPS.
      [John Tobey <jtobey@channel1.com>]
 
-  *) Make links whenever Configure is run.
+  *) Make links whenever Configure is run, unless we are on Windoze.
      [Ben Laurie]
 
   *) Permit extensions to be added to CRLs using crl_section in openssl.cnf.
diff --git a/Configure b/Configure
index aaeda7992003f7b13fb35a94c36bad7701cac822..51e4b83f9264b60ca60e4a86e96dbd7d9ff3a939 100755
--- a/Configure
+++ b/Configure
@@ -246,6 +246,9 @@ my %misc_table = (
 "VC-NT", 	"96:60:152:40:4212:20:1"
 );
 
+my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
+	BC-16 CygWin32);
+
 my $no_asm=0;
 my $postfix="org";
 my $Makefile="Makefile.ssl";
@@ -322,6 +325,10 @@ if (!defined($table{$target}))
 	exit(1);
 	}
 
+my $IsWindows=scalar grep /^$target$/,@WinTargets;
+
+print "IsWindows=$IsWindows\n";
+
 (my $cc,my $cflags,my $lflags,my $bn_ops,my $bn_obj,my $des_obj,my $bf_obj,
  $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj)=
 	split(/\s*:\s*/,$table{$target} . ":" x 20 , -1);
@@ -669,7 +676,7 @@ print "RC2 uses u$type[$rc2_int]\n" if $rc2_int != $def_int;
 print "BF_PTR used\n" if $bf_ptr == 1; 
 print "BF_PTR2 used\n" if $bf_ptr == 2; 
 
-system 'make links';
+system 'make links' if !$IsWindows;
 
 exit(0);