diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b32.recipe b/dev-lang/openjdk/openjdk-1.7.u80_b32.recipe
similarity index 71%
rename from dev-lang/openjdk/openjdk-1.7_u80_b32.recipe
rename to dev-lang/openjdk/openjdk-1.7.u80_b32.recipe
index 0d5bb5994..0e899d9cc 100644
--- a/dev-lang/openjdk/openjdk-1.7_u80_b32.recipe
+++ b/dev-lang/openjdk/openjdk-1.7.u80_b32.recipe
@@ -39,48 +39,48 @@ DISABLE_SOURCE_PACKAGE=yes
 	# at least as long as Ant and a complete SDK image are part of the sources
 
 PROVIDES="
-	openjdk$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jexec = $portVersion compat >= 1
-	cmd:appletviewer = $portVersion compat >= 1
-	cmd:apt = $portVersion compat >= 1
-	cmd:extcheck = $portVersion compat >= 1
-	cmd:idlj = $portVersion compat >= 1
-	cmd:jar = $portVersion compat >= 1
-	cmd:jarsigner = $portVersion compat >= 1
-	cmd:java = $portVersion compat >= 1
-	cmd:java_config = $portVersion compat >= 1
-	cmd:javac = $portVersion compat >= 1
-	cmd:javadoc = $portVersion compat >= 1
-	cmd:javah = $portVersion compat >= 1
-	cmd:javap = $portVersion compat >= 1
-	cmd:jcmd = $portVersion compat >= 1
-	cmd:jconsole = $portVersion compat >= 1
-	cmd:jdb = $portVersion compat >= 1
-	cmd:jhat = $portVersion compat >= 1
-	cmd:jinfo = $portVersion compat >= 1
-	cmd:jmap = $portVersion compat >= 1
-	cmd:jps = $portVersion compat >= 1
-	cmd:jrunscript = $portVersion compat >= 1
-	cmd:jsadebugd = $portVersion compat >= 1
-	cmd:jstack = $portVersion compat >= 1
-	cmd:jstat = $portVersion compat >= 1
-	cmd:jstatd = $portVersion compat >= 1
-	cmd:keytool = $portVersion compat >= 1
-	cmd:native2ascii = $portVersion compat >= 1
-	cmd:orbd = $portVersion compat >= 1
-	cmd:pack200 = $portVersion compat >= 1
-	cmd:policytool = $portVersion compat >= 1
-	cmd:rmic = $portVersion compat >= 1
-	cmd:rmid = $portVersion compat >= 1
-	cmd:rmiregistry = $portVersion compat >= 1
-	cmd:schemagen = $portVersion compat >= 1
-	cmd:serialver = $portVersion compat >= 1
-	cmd:servertool = $portVersion compat >= 1
-	cmd:tnameserv = $portVersion compat >= 1
-	cmd:unpack200 = $portVersion compat >= 1
-	cmd:wsgen = $portVersion compat >= 1
-	cmd:wsimport = $portVersion compat >= 1
-	cmd:xjc = $portVersion compat >= 1
+	openjdk$secondaryArchSuffix = $portVersion compat >= 1.7
+	cmd:jexec = $portVersion compat >= 1.7
+	cmd:appletviewer = $portVersion compat >= 1.7
+	cmd:apt = $portVersion compat >= 1.7
+	cmd:extcheck = $portVersion compat >= 1.7
+	cmd:idlj = $portVersion compat >= 1.7
+	cmd:jar = $portVersion compat >= 1.7
+	cmd:jarsigner = $portVersion compat >= 1.7
+	cmd:java = $portVersion compat >= 1.7
+	cmd:java_config = $portVersion compat >= 1.7
+	cmd:javac = $portVersion compat >= 1.7
+	cmd:javadoc = $portVersion compat >= 1.7
+	cmd:javah = $portVersion compat >= 1.7
+	cmd:javap = $portVersion compat >= 1.7
+	cmd:jcmd = $portVersion compat >= 1.7
+	cmd:jconsole = $portVersion compat >= 1.7
+	cmd:jdb = $portVersion compat >= 1.7
+	cmd:jhat = $portVersion compat >= 1.7
+	cmd:jinfo = $portVersion compat >= 1.7
+	cmd:jmap = $portVersion compat >= 1.7
+	cmd:jps = $portVersion compat >= 1.7
+	cmd:jrunscript = $portVersion compat >= 1.7
+	cmd:jsadebugd = $portVersion compat >= 1.7
+	cmd:jstack = $portVersion compat >= 1.7
+	cmd:jstat = $portVersion compat >= 1.7
+	cmd:jstatd = $portVersion compat >= 1.7
+	cmd:keytool = $portVersion compat >= 1.7
+	cmd:native2ascii = $portVersion compat >= 1.7
+	cmd:orbd = $portVersion compat >= 1.7
+	cmd:pack200 = $portVersion compat >= 1.7
+	cmd:policytool = $portVersion compat >= 1.7
+	cmd:rmic = $portVersion compat >= 1.7
+	cmd:rmid = $portVersion compat >= 1.7
+	cmd:rmiregistry = $portVersion compat >= 1.7
+	cmd:schemagen = $portVersion compat >= 1.7
+	cmd:serialver = $portVersion compat >= 1.7
+	cmd:servertool = $portVersion compat >= 1.7
+	cmd:tnameserv = $portVersion compat >= 1.7
+	cmd:unpack200 = $portVersion compat >= 1.7
+	cmd:wsgen = $portVersion compat >= 1.7
+	cmd:wsimport = $portVersion compat >= 1.7
+	cmd:xjc = $portVersion compat >= 1.7
 	"
 
 REQUIRES="
@@ -92,13 +92,13 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	ca_root_certificates
 	devel:libfreetype$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	ca_root_certificates
 	cmd:cpio
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
@@ -170,7 +170,7 @@ INSTALL()
 	mkdir -p $certDir
 	csplit -f $certDir/ /system/data/ssl/CARootCertificates.pem "/-----BEGIN CERTIFICATE-----/" {*}
 
-	rm certs/00
+	rm $certDir/00
 
 	for cert in $certDir/*; do
 		$jdkDir/bin/keytool -import -noprompt -keystore $cacerts \