diff --git a/installer/install.xml b/installer/install.xml
index d8ebb7d35..a4894b4e4 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -102,12 +102,13 @@
             <description>Base installation files</description>
             <fileset dir="pkg-temp" includes="**/*" targetdir="$INSTALL_PATH"/>
             <!--
-              Do variable substitution in the wrapper.config and i2prouter files. See:
+              Do variable substitution in these files. See:
               http://www.javalobby.org/forums/thread.jspa?threadID=15967&tstart=0
               and the izpack docs for some guidance.
              -->
             <parsable targetfile="$INSTALL_PATH/wrapper.config" type="javaprop" />
             <parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix|mac" />
+            <parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix|mac" />
             
             <!-- postinstall stuff for windows -->
             <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
diff --git a/installer/resources/eepget b/installer/resources/eepget
index d4ea04b34..080bcc8d8 100644
--- a/installer/resources/eepget
+++ b/installer/resources/eepget
@@ -1,4 +1,3 @@
 #!/bin/sh
-#export I2P=~i2p/i2p
-export I2P=`dirname $0`
-java -cp $I2P/lib/i2p.jar net.i2p.util.EepGet $*
+I2P="%INSTALL_PATH"
+java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"