--- configure	2010-06-17 02:13:17.000000000 +0200
+++ configure.fedjpkgcompat	2010-07-17 14:08:10.952997785 +0200
@@ -623,7 +623,7 @@
 	# and Ubuntu
 	$os = "debian";
 } elsif ( -f "/etc/fedora-release" ) {
-	output "Fedora Core";
+	output "Fedora";
 	$os = "fedora";
 } elsif ( -f "/etc/SuSE-release" ) {
 	output "Open SuSE";
@@ -642,6 +642,15 @@
 } elsif ( -f "/etc/slackware-version" ) {
 	output "Slackware";
 	$os = "slackware";
+} elsif ( -f "/etc/centos-release" ) {
+	output "CentOS";
+	$os = "fedora";
+} elsif ( -f "/etc/redhat-release" ) {
+	output "RedHat";
+	$os = "fedora";
+} elsif ( -f "/etc/java/jpackage-release" ) {
+	output "JPackage";
+	$os = "fedora";
 }
 
 if ($os) {
@@ -1146,11 +1155,11 @@
 		$javadoc_candidate = "$jdk_home/bin/javadoc";
 		$vendor = "Specified";
 	} else {
-		$javac_candidate = "/usr/lib/jvm/java-ibm/bin/javac";
-		$javah_candidate = "/usr/lib/jvm/java-ibm/bin/javah";
-		$jar_candidate = "/usr/lib/jvm/java-ibm/bin/jar";
-		$javadoc_candidate = "/usr/lib/jvm/java-ibm/bin/javadoc";
-		$vendor = "IBM";
+		$javac_candidate = "/usr/bin/javac";
+		$javah_candidate = "/usr/bin/javah";
+		$jar_candidate = "/usr/bin/jar";
+		$javadoc_candidate = "/usr/bin/javadoc";
+		$vendor = "System Default";
 	}
 	check_compiler($javac, "$vendor javac", $javac_candidate, "-g -source 1.5 -target 1.5");
 
@@ -1515,8 +1524,8 @@
 		$java_candidate = "$jdk_home/bin/java";
 		$vendor = "Specified";
 	} else {
-		$java_candidate = "/usr/lib/jvm/jre-ibm/bin/java";
-		$vendor = "IBM";
+		$java_candidate = "/usr/bin/java";
+		$vendor = "System Default";
 	}
 	check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea");
 
@@ -1998,6 +2007,9 @@
 	my $jni_include = "";
 	my $java_home = dirname($java);
 	$java_home =~ s/\/bin$//;
+	if ($os eq "fedora" && $java_home eq "/usr") {
+	    $java_home = "/usr/lib/jvm/java";
+	}
 
 	if (!-d "$java_home"."/include") {
 		$java_home =~ s/\/jre//;