diff --git a/Configure b/Configure
index 4867475b6..c309485b2 100755
--- a/Configure
+++ b/Configure
@@ -1268,22 +1268,17 @@ print "Configuring for $target\n";
 my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
 if ($d) {
     $build_prefix = "debug_";
+    $target = $t;
 
     # If we do not find debug-foo in the table, the target is set to foo,
     # but only if the foo target has a noon-empty debug_cflags or debug_lflags
     # attribute.
-    if (!$table{$target} && ($table{$t}->{debug_cflags}
-			     || $table{$t}->{debug_lflags})) {
+    if (!$table{$target}) {
 	$target = $t;
     }
 }
 
-&usage if (!defined($table{$target})
-	   || $table{$target}->{template}
-	   || ($build_prefix eq "debug_"
-	       && $target !~ /^debug-/
-	       && !($table{$target}->{debug_cflags}
-		    || $table{$target}->{debug_lflags})));
+&usage if (!defined($table{$target}) || $table{$target}->{template});
 
 if ($fips)
 	{