diff --git a/mambabase/mambabase.sh b/mambabase/mambabase.sh
index f720dc0..b6baef1 100644
--- a/mambabase/mambabase.sh
+++ b/mambabase/mambabase.sh
@@ -241,13 +241,19 @@ if [ "$INSTALL_SKYPE" = "1" ]; then
    /usr/bin/openmamba-netsrpms skype
 fi
 
+if [ "$INSTALL_JAVA" = "1" ]; then
+   dcop_write $"Installing Oracle Java 7..." 10
+   /usr/bin/openmamba-netsrpms sun-java7
+fi
+
+if [ "$INSTALL_JRE" = "1" ]; then
+   dcop_write $"Installing Sun Java Runtime Environment..." 10
+   apt_get_parsed install -y $SUN_JAVA_RUNTIME_PKGS
+fi
+
 if [ "$INSTALL_JDK" = "1" ]; then
    dcop_write $"Installing Sun Java Developers Kit..." 10
    apt_get_parsed install -y $SUN_JAVA_PKGS
-
-elif [ "$INSTALL_JRE" = "1" ]; then
-   dcop_write $"Installing Sun Java Runtime Environment..." 10
-   apt_get_parsed install -y $SUN_JAVA_RUNTIME_PKGS
 fi
 
 dcop_write $"Installation completed." -1