diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index c06e3b761..98dfd46f0 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -143,6 +143,11 @@ if [ ! -n $LANG ]; then
         done
 fi
 
+# Mac OSX 10.10 requires the parameter bellow to run without a icon in the Dock.
+if [ "`uname -s`" = "Darwin" ]; then
+    export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
+fi
+
 # When installing on On Mac OSX platforms, the following domain will be used to
 #  prefix the plist file name.
 PLIST_DOMAIN=org.tanukisoftware.wrapper
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
index 949a7abd7..27d79c8eb 100644
--- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh
@@ -22,6 +22,9 @@ CP=
 for jars in `ls ${I2P}/lib/*.jar`; do CP=${CP}:${jars}; done
 JAVA=java
 
+if [ "`uname -s`" = "Darwin" ]; then
+    export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
+fi
 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"