diff --git a/conf/distro/include/angstrom-java.inc b/conf/distro/include/angstrom-java.inc
index a0f5792..dc1f55e 100644
--- a/conf/distro/include/angstrom-java.inc
+++ b/conf/distro/include/angstrom-java.inc
@@ -1,6 +1,13 @@
-# Set PREFFERED and VERSION stuff for working java-toolchain
+# Set PREFFERED and VERSION stuff for working java runtime
 
-PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_VERSION_classpath-native = "0.98"
-PREFERRED_VERSION_classpath = "0.98"
+PREFERRED_VERSION_openjdk-7-jre = "03b21-2.1.8"
+PREFERRED_VERSION_icedtea7-native = "2.1.3"
+
+# jamvm
+PREFERRED_VERSION_jamvm = "1.5.5+1.6.0-devel+git%"
+PREFERRED_VERSION_jamvm-native = "1.5.5+1.6.0-devel+git%"
+PREFERRED_PROVIDER_java2-vm = "${DEFAULTJRE}"
+PREFERRED_PROVIDER_java2-runtime = "${DEFAULTJRE}"
+PREFERRED_PROVIDER_openjdk-7-jre = "${DEFAULTJRE}"
+
+DEFAULTJRE ?= "openjdk-7-jre"