diff --git a/Makefile.defs b/Makefile.defs
index 788dfb8..19fd797 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -210,7 +210,7 @@ splashtheme = splash-theme-openmamba
 alsaplayer_output = alsaplayer-output-alsa
 #libscanpci.so = xorg-server
 
-java-openjdk-runtime = java-openjdk7-runtime
+#java-openjdk-runtime = java-openjdk8-runtime
 
 ifeq ($(ARCH),x86_64)
 libOpenCL.so.1[][64bit] = ocl-icd
@@ -221,24 +221,29 @@ libGLU.so.1[][64bit] = libGL-Mesa-dri
 libbluetooth.so.3[][64bit] = libbluetooth
 libgtkpeer.so[][64bit] = libgcj4
 libjvm.so[][64bit] = libgcj4
-libjawt.so[][64bit] = java-openjdk7-runtime
+libjawt.so[][64bit] = java-openjdk-runtime
 libawt.so[][64bit] = libgcj4
-libjava.so[][64bit] = java-openjdk7-runtime
-libjava_crw_demo.so[][64bit] = java-openjdk7-runtime
-libjli.so[][64bit] = java-openjdk7-runtime
-libjli.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
-libmawt.so[][64bit] = java-openjdk7-runtime
-libnet.so[][64bit] = java-openjdk7-runtime
-libnio.so[][64bit] = java-openjdk7-runtime
-libverify.so[][64bit] = java-openjdk7-runtime
-libjava.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
-libjava_crw_demo.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
-libjvm.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
-libjawt.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
-libmawt.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
-libnet.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
-libnio.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
-libverify.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libjava.so[][64bit] = java-openjdk-runtime
+libjava_crw_demo.so[][64bit] = java-openjdk-runtime
+libjli.so[][64bit] = java-openjdk-runtime
+libjli.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+liblgpllibs.so[][64bit] = firefox
+libs.so[][64bit] = firefox
+libmawt.so[][64bit] = java-openjdk-runtime
+libnet.so[][64bit] = java-openjdk-runtime
+libnio.so[][64bit] = java-openjdk-runtime
+libverify.so[][64bit] = java-openjdk-runtime
+libjava.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libjava_crw_demo.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libjvm.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libjawt.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libmawt.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libmozgtk.so[][64bit] = firefox
+libmozsandbox.so[][64bit] = firefox
+libxul.so[][64bit] = firefox
+libnet.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libnio.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libverify.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
 libphonon.so.4[][64bit] = libphonon
 libplasmacomicprovidercore.so.1[][64bit] = libkdeplasma-addons
 libplasmapotdprovidercore.so.1[][64bit] = libkdeplasma-addons
@@ -293,22 +298,26 @@ libgtkpeer.so = libgcj4
 libjvm.so = libgcj4
 libjawt.so = libgcj4
 libawt.so = libgcj4
-libjava.so = java-openjdk7-runtime
-libjava_crw_demo.so = java-openjdk7-runtime
-libjli.so = java-openjdk7-runtime
-libjli.so[SUNWprivate_1.1] = java-openjdk7-runtime
-libmawt.so = java-openjdk7-runtime
-libnet.so = java-openjdk7-runtime
-libnio.so = java-openjdk7-runtime
-libverify.so = java-openjdk7-runtime
-libjava.so[SUNWprivate_1.1] = java-openjdk7-runtime
-libjava_crw_demo.so[SUNWprivate_1.1] = java-openjdk7-runtime
-libjvm.so[SUNWprivate_1.1] = java-openjdk7-runtime
-libjawt.so[SUNWprivate_1.1] = java-openjdk7-runtime
-libmawt.so[SUNWprivate_1.1] = java-openjdk7-runtime
-libnet.so[SUNWprivate_1.1] = java-openjdk7-runtime
-libnio.so[SUNWprivate_1.1] = java-openjdk7-runtime
-libverify.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libjava.so = java-openjdk-runtime
+libjava_crw_demo.so = java-openjdk-runtime
+libjli.so = java-openjdk-runtime
+libjli.so[SUNWprivate_1.1] = java-openjdk-runtime
+liblgpllibs.so = firefox
+libmawt.so = java-openjdk-runtime
+libnet.so = java-openjdk-runtime
+libnio.so = java-openjdk-runtime
+libverify.so = java-openjdk-runtime
+libjava.so[SUNWprivate_1.1] = java-openjdk-runtime
+libjava_crw_demo.so[SUNWprivate_1.1] = java-openjdk-runtime
+libjvm.so[SUNWprivate_1.1] = java-openjdk-runtime
+libjawt.so[SUNWprivate_1.1] = java-openjdk-runtime
+libmawt.so[SUNWprivate_1.1] = java-openjdk-runtime
+libmozgtk.so = firefox
+libmozsandbox.so = firefox
+libxul.so = firefox
+libnet.so[SUNWprivate_1.1] = java-openjdk-runtime
+libnio.so[SUNWprivate_1.1] = java-openjdk-runtime
+libverify.so[SUNWprivate_1.1] = java-openjdk-runtime
 libplasmacomicprovidercore.so.1 = libkdeplasma-addons
 libplasmapotdprovidercore.so.1 = libkdeplasma-addons
 libphonon.so.4 = libphonon