diff --git a/Makefile.defs b/Makefile.defs
index 8976878..7e313c6 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -109,36 +109,53 @@ endif
 libOpenCL.so.1 = xorg-drv-video-fglrx xorg-drv-video-nvidia
 xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-evdev
 # xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch xorg-drv-input-vboxmouse
-libGL.so.1 = libGL-Mesa-dri
-libGLU.so.1 = libGL-Mesa-dri
-libGL.so.1[][64bit] = libGL-Mesa-dri
-libGLU.so.1[][64bit] = libGL-Mesa-dri
-
 splashtheme = splash-theme-openmamba
-
 alsaplayer_output = alsaplayer-output-alsa
 #libscanpci.so = xorg-server
+
+ifeq ($(ARCH),x86_64)
+libGL.so.1[][64bit] = libGL-Mesa-dri
+libGLU.so.1[][64bit] = libGL-Mesa-dri
+libgtkpeer.so[][64bit] = libgcj4
+libjvm.so[][64bit] = libgcj4
+libjawt.so[][64bit] = libgcj4
+libawt.so[][64bit] = libgcj4
+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
+libmawt.so[][64bit] = java-openjdk-runtime
+libnet.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
+libnet.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libverify.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libphonon.so.4[][64bit] = libphonon
+else
+libGL.so.1 = libGL-Mesa-dri
+libGLU.so.1 = libGL-Mesa-dri
 libgtkpeer.so = libgcj4
 libjvm.so = libgcj4
 libjawt.so = libgcj4
 libawt.so = libgcj4
-libjava.so = sun-java-runtime
-libjava_crw_demo.so = sun-java-runtime
-libjli.so = sun-java-runtime
-libjli.so[SUNWprivate_1.1] = sun-java-runtime
-libmawt.so = sun-java-runtime
-libnet.so = sun-java-runtime
-libverify.so = sun-java-runtime
-libjava.so[SUNWprivate_1.1] = sun-java-runtime
-libjava_crw_demo.so[SUNWprivate_1.1] = sun-java-runtime
-libjvm.so[SUNWprivate_1.1] = sun-java-runtime
-libjawt.so[SUNWprivate_1.1] = sun-java-runtime
-libmawt.so[SUNWprivate_1.1] = sun-java-runtime
-libnet.so[SUNWprivate_1.1] = sun-java-runtime
-libverify.so[SUNWprivate_1.1] = sun-java-runtime
-ifeq ($(ARCH),x86_64)
-libphonon.so.4[][64bit] = libphonon
-else
+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
+libmawt.so = java-openjdk-runtime
+libnet.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
+libnet.so[SUNWprivate_1.1] = java-openjdk-runtime
+libverify.so[SUNWprivate_1.1] = java-openjdk-runtime
 libphonon.so.4 = libphonon
 endif
 /usr/bin/python = python