diff --git a/Configure b/Configure
index 79edba214ccbd820a65a4a68f4c6e45574f8e73a..83d4196da4144795f530378f11675c56e7bc9ccf 100755
--- a/Configure
+++ b/Configure
@@ -2,7 +2,6 @@
 
 require 5.000;
 use strict;
-use POSIX qw(:errno_h);
 
 #
 # see PROBLEMS for instructions on what sort of things to do when 
@@ -295,7 +294,7 @@ if (!defined($table{$target}))
 
 (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});
+	split(/\s*:\s*/,$table{$target} . ":" x 20 , -1);
 $cflags="$flags$cflags" if ($flags ne "");
 $lflags="$libs$lflags"if ($libs ne "");
 
@@ -306,6 +305,7 @@ if ($no_asm)
 	}
 
 my ($bn1)=split(/\s+/,$bn_obj);
+$bn1 = "" unless defined $bn1;
 $bn1=$bn_asm unless ($bn1 =~ /\.o$/);
 $bn_obj="$bn1";
 
@@ -610,11 +610,10 @@ sub bad_target
 sub Rename
 	{
 	my($from,$to)=@_;
-
 	unlink($to);
 	if(!rename($from,$to))
 	    {
-	    POSIX::errno() == POSIX::ENOENT || die "unable to rename $from to $to:$!\n";
+	     -e $from && die "unable to rename $from to $to:$!\n";
 	    }
 	}