diff --git a/PMS.launch b/PMS.launch
index d7e04fb76..49e2edd9b 100644
--- a/PMS.launch
+++ b/PMS.launch
@@ -13,5 +13,5 @@
-
+
diff --git a/src/main/external-resources/PMS.bat b/src/main/external-resources/PMS.bat
index 9929e8d8e..8f30d3c9c 100755
--- a/src/main/external-resources/PMS.bat
+++ b/src/main/external-resources/PMS.bat
@@ -6,4 +6,4 @@ echo You can try to reduce the Xmx parameter value if you keep getting "Cannot c
echo Last word: You must have java installed ! http://www.java.com
echo ------------------------------------------------
pause
-start javaw -Xmx768M -Dfile.encoding=UTF-8 -classpath update.jar;pms.jar net.pms.PMS
+start javaw -Xmx768M -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -classpath update.jar;pms.jar net.pms.PMS
diff --git a/src/main/external-resources/PMS.sh b/src/main/external-resources/PMS.sh
index 7e3c92614..32d425f7d 100755
--- a/src/main/external-resources/PMS.sh
+++ b/src/main/external-resources/PMS.sh
@@ -49,4 +49,4 @@ if $cygwin; then
fi
# Execute the JVM
-exec "$JAVA" $JAVA_OPTS -Xmx768M -Xss1024k -Dfile.encoding=UTF-8 -classpath "$PMS_JARS" net.pms.PMS "$@"
+exec "$JAVA" $JAVA_OPTS -Xmx768M -Xss1024k -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -classpath "$PMS_JARS" net.pms.PMS "$@"
diff --git a/src/main/external-resources/nsis/pms.nsi b/src/main/external-resources/nsis/pms.nsi
index f6eb860c1..a4f1d486d 100644
--- a/src/main/external-resources/nsis/pms.nsi
+++ b/src/main/external-resources/nsis/pms.nsi
@@ -50,7 +50,7 @@ Section ""
; change for your purpose (-jar etc.)
${GetParameters} $1
- StrCpy $0 '"$R0" -classpath update.jar;pms.jar -Xmx768M -Dfile.encoding=UTF-8 ${CLASS} $1'
+ StrCpy $0 '"$R0" -classpath update.jar;pms.jar -Xmx768M -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 ${CLASS} $1'
SetOutPath $EXEDIR
Exec $0