--- /usr/bin/mvn-3.0.bak	2013-01-14 06:22:17.688663940 +0100
+++ /usr/bin/mvn-3.0	2013-01-14 06:37:53.622693687 +0100
@@ -63,10 +63,10 @@
            ;;
 esac
 
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
+if [ -r /etc/gentoo-release ] ; then
+  JAVA_HOME=`java-config --jre-home`
+  JAVA_CMD=`java-config --java`
+  JAVAC=`java-config --javac`
 fi
 
 if [ -z "$M2_HOME" ] ; then