diff --git a/history.txt b/history.txt
index 98cd552e40..d53138876d 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2011-11-01 kytv
+  * Update Ukrainian translations from Transifex
+  * Update i2prouter script for better compatibility with Gentoo
+
 2011-10-31 zzz
   * NetDB: Reduce max RI publish interval
   * ProfileOrganizer:
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index a9cb9df8ae..30b09ada54 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -131,6 +131,20 @@ PLIST_DOMAIN=org.tanukisoftware.wrapper
 
 # Do not modify anything beyond this point
 #-----------------------------------------------------------------------------
+# Workaround for Gentoo
+JAVABINARY=`grep ^wrapper\.java\.command $I2P/wrapper.config | cut -f2 -d=`
+
+if [ -e /etc/gentoo-release ]; then
+    if [ $JAVABINARY = java ]; then
+        if [ -x /etc/java-config-2/current-system-vm/bin/java ]; then
+            JAVABINARY="/etc/java-config-2/current-system-vm/bin/java"
+        else
+            echo "Please set wrapper.java.command in $I2P/wrapper.config"
+            exit 1
+        fi
+    fi
+fi
+
 WRAPPER_URL="http://www.i2p2.de/manualwrapper"
 unsupported() {
     echo "The most likely reason is that a supported version of the java"
@@ -840,7 +854,7 @@ console() {
         prepAdditionalParams "$@"
 
         # The string passed to eval must handles spaces in paths correctly.
-        COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $ADDITIONAL_PARA"
+        COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $ADDITIONAL_PARA"
         eval $COMMAND_LINE
         if [ "$?" -ne "0" ]; then
                 failed
@@ -965,7 +979,7 @@ start() {
         prepAdditionalParams "$@"
 
         # The string passed to eval must handles spaces in paths correctly.
-        COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $ADDITIONAL_PARA"
+        COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $ADDITIONAL_PARA"
         eval $COMMAND_LINE
         if [ "$?" -ne "0" ]; then
                 failed
diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
index 98eb29e8ae..2c11b56aa8 100644
--- a/installer/resources/wrapper.config
+++ b/installer/resources/wrapper.config
@@ -31,6 +31,8 @@ wrapper.java.command=java
 #  Specify a specific java binary:
 #set.JAVA_HOME=/java/path
 #wrapper.java.command=%JAVA_HOME%/bin/java
+# Gentoo uses the following:
+#wrapper.java.command=/etc/java-config-2/current-system-vm/bin/java
 # Tell the Wrapper to log the full generated Java command line.
 #wrapper.java.command.loglevel=INFO