Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 31020)
+++ /trunk/Config.kmk	(revision 31021)
@@ -472,5 +472,5 @@
 endif
 # Use XPIDL instead of XSLT stylesheet
-VBOX_WITH_JAVA_SUPPORT_IN_XPIDL ?= 
+VBOX_WITH_JAVA_SUPPORT_IN_XPIDL ?=
 # Build against multiple Python versions present in the system
 VBOX_WITH_MULTIVERSION_PYTHON ?= 1
@@ -4327,5 +4327,5 @@
 VBOX_XIDL_FILE         = $(PATH_OUT)/obj/VirtualBox_stripped.xidl
 
-# Java stuff, move to tools eventually
+# Java stuff.
 ifeq ($(KBUILD_TARGET), darwin)
  VBOX_JAVA_HOME = /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0
@@ -4338,16 +4338,22 @@
 else
 
- ifeq ($(KBUILD_TARGET), linux)
-  ifeq ($(origin VBOX_JAVA_HOME), undefined)
-   VBOX_JAVA_HOME := $(firstword $(wildcard $(PATH_DEVTOOLS)/linux.x86/jdk1.6.0_21) /usr/lib/jvm/java-6-sun)
+ ifeq ($(KBUILD_TARGET),linux)
+  ifeq ($(origin VBOX_JAVA_HOME),undefined)
+   # Add correct detection for you distro after the /usr/../java-6-sun line.
+   VBOX_JAVA_HOME := $(firstword $(wildcard \
+	$(PATH_DEVTOOLS)/linux.x86/jdk1.6.0_21 \
+	/usr/lib/jvm/java-6-sun  \
+	\
+	/usr/lib/jvm/sun-jdk-1.6 \
+	) /usr/lib/jvm/java-6-sun)
   endif
  endif
 
- ifeq ($(KBUILD_TARGET), solaris)
+ ifeq ($(KBUILD_TARGET),solaris)
   # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
   VBOX_JAVA_HOME ?= /usr/java
  endif
 
- ifeq ($(KBUILD_TARGET), win)
+ ifeq ($(KBUILD_TARGET),win)
   VBOX_JAVA_HOME ?= c:/jdk
  endif
@@ -4359,6 +4365,7 @@
  # correct for targets we care about
  VBOX_MD_OS = $(KBUILD_TARGET)
- VBOX_JAVA_INC  = $(VBOX_JAVA_HOME)/include               \
-                  $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
+ VBOX_JAVA_INC  = \
+ 	$(VBOX_JAVA_HOME)/include \
+ 	$(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
 endif