diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
index 6e1af883f8c3a546516b369bd3e115445ddc681d..a6f76537fa511f46a4509cfb244e002849175a2d 100644
--- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh
@@ -14,9 +14,13 @@
 I2P="%INSTALL_PATH"
 I2PTEMP="%SYSTEM_java_io_tmpdir"
 
+# Having IPv6 enabled can cause problems with certain configurations. Changing the
+# next value to true may help. 
+PREFERv4="false"
+
 export CP="${I2P}" ; for j in "${I2P}/lib/*"  ; do export CP="${CP}:${j}" ; done;
 JAVA=java
 
-JAVAOPTS="-Djava.net.preferIPv4Stack=true -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
+JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
 nohup ${JAVA} -cp "${CP}" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1 &
 echo $! > "${I2PTEMP}/router.pid"
diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
index e7e531248ac26067be8d491fa98a7328138fdc0d..2a459d6d4af96cbe6993829f46b18ae91a1b7861 100644
--- a/installer/resources/wrapper.config
+++ b/installer/resources/wrapper.config
@@ -60,7 +60,15 @@ wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
 wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
 wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
 wrapper.java.additional.4.stripquotes=TRUE
-wrapper.java.additional.5=-Djava.net.preferIPv4Stack=true
+
+# On some IPv6 enabled systems, I2P and other network-enabled java applications
+# may fail to start. For examples see
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560044. 
+# Two things that may help if you experience this issue
+# 1) "echo 0 > /proc/sys/net/ipv6/bindv6only" as root; or
+# 2) uncomment the following line:
+#wrapper.java.additional.5=-Djava.net.preferIPv4Stack=true
+
 # Jetty says this is a security risk
 # Uncommenting this won't help as the router forces it to true
 # If you really need this, you have to set it in jetty.xml