diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
index bff40e6c..cfe95d1a 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
@@ -26,7 +26,6 @@ package org.libresonic.player.command;
  */
 public class NetworkSettingsCommand {
 
-    private boolean portForwardingEnabled;
     private boolean urlRedirectionEnabled;
     private String urlRedirectFrom;
     private String urlRedirectCustomUrl;
@@ -34,14 +33,6 @@ public class NetworkSettingsCommand {
     private int port;
     private boolean toast;
 
-    public void setPortForwardingEnabled(boolean portForwardingEnabled) {
-        this.portForwardingEnabled = portForwardingEnabled;
-    }
-
-    public boolean isPortForwardingEnabled() {
-        return portForwardingEnabled;
-    }
-
     public boolean isUrlRedirectionEnabled() {
         return urlRedirectionEnabled;
     }
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/NetworkSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/NetworkSettingsController.java
index 84a35379..c955743d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/NetworkSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/NetworkSettingsController.java
@@ -51,7 +51,6 @@ public class NetworkSettingsController {
     @ModelAttribute
     protected void formBackingObject(Model model) throws Exception {
         NetworkSettingsCommand command = new NetworkSettingsCommand();
-        command.setPortForwardingEnabled(settingsService.isPortForwardingEnabled());
         command.setUrlRedirectionEnabled(settingsService.isUrlRedirectionEnabled());
         command.setUrlRedirectType(settingsService.getUrlRedirectType().name());
         command.setUrlRedirectFrom(settingsService.getUrlRedirectFrom());
@@ -68,7 +67,6 @@ public class NetworkSettingsController {
     @RequestMapping(method = RequestMethod.POST)
     protected String doSubmitAction(@ModelAttribute("command") NetworkSettingsCommand command, RedirectAttributes redirectAttributes) throws Exception {
 
-        settingsService.setPortForwardingEnabled(command.isPortForwardingEnabled());
         settingsService.setUrlRedirectionEnabled(command.isUrlRedirectionEnabled());
         settingsService.setUrlRedirectType(UrlRedirectType.valueOf(command.getUrlRedirectType()));
         settingsService.setUrlRedirectFrom(StringUtils.lowerCase(command.getUrlRedirectFrom()));
@@ -80,7 +78,6 @@ public class NetworkSettingsController {
         }
 
         settingsService.save();
-        networkService.initPortForwarding(0);
         networkService.initUrlRedirection(true);
 
         redirectAttributes.addFlashAttribute("settings_toast", true);
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java b/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
index 23648f51..5d0e7ae7 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
@@ -34,9 +34,6 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.libresonic.player.Logger;
 import org.libresonic.player.domain.UrlRedirectType;
-import org.libresonic.player.service.upnp.ClingRouter;
-import org.libresonic.player.service.upnp.NATPMPRouter;
-import org.libresonic.player.service.upnp.Router;
 import org.libresonic.player.util.StringUtil;
 
 import java.io.IOException;
@@ -57,7 +54,6 @@ import java.util.concurrent.TimeUnit;
 public class NetworkService {
 
     private static final Logger LOG = Logger.getLogger(NetworkService.class);
-    private static final long PORT_FORWARDING_DELAY = 3600L;
     private static final long URL_REDIRECTION_DELAY = 2 * 3600L;
 
     private static final String URL_REDIRECTION_REGISTER_URL = getBackendUrl() + "/backend/redirect/register.view";
@@ -65,33 +61,22 @@ public class NetworkService {
     private static final String URL_REDIRECTION_TEST_URL = getBackendUrl() + "/backend/redirect/test.view";
 
     private SettingsService settingsService;
-    private UPnPService upnpService;
     private final ScheduledExecutorService executor = Executors.newScheduledThreadPool(4);
-    private final PortForwardingTask portForwardingTask = new PortForwardingTask();
     private final URLRedirectionTask urlRedirectionTask = new URLRedirectionTask();
-    private Future<?> portForwardingFuture;
     private Future<?> urlRedirectionFuture;
 
-    private final Status portForwardingStatus = new Status();
+    private final static Status portForwardingStatus;
+    static {
+        portForwardingStatus = new Status();
+        portForwardingStatus.setText("NOT SUPPORTED");
+    }
     private final Status urlRedirectionStatus = new Status();
     private boolean testUrlRedirection;
 
     public void init() {
-        initPortForwarding(10);
         initUrlRedirection(false);
     }
 
-    /**
-     * Configures UPnP port forwarding.
-     */
-    public synchronized void initPortForwarding(int initialDelaySeconds) {
-        portForwardingStatus.setText("Idle");
-        if (portForwardingFuture != null) {
-            portForwardingFuture.cancel(true);
-        }
-        portForwardingFuture = executor.scheduleWithFixedDelay(portForwardingTask, initialDelaySeconds, PORT_FORWARDING_DELAY, TimeUnit.SECONDS);
-    }
-
     /**
      * Configures URL redirection.
      *
@@ -133,95 +118,6 @@ public class NetworkService {
         this.settingsService = settingsService;
     }
 
-    public void setUpnpService(UPnPService upnpService) {
-        this.upnpService = upnpService;
-    }
-
-    private class PortForwardingTask extends Task {
-
-        @Override
-        protected void execute() {
-
-            boolean enabled = settingsService.isPortForwardingEnabled();
-            portForwardingStatus.setText("Looking for router...");
-            Router router = findRouter();
-            if (router == null) {
-                LOG.warn("No UPnP router found.");
-                portForwardingStatus.setText("No router found.");
-            } else {
-
-                portForwardingStatus.setText("Router found.");
-
-                int port = settingsService.getPort();
-                int httpsPort = settingsService.getHttpsPort();
-
-                // Create new NAT entry.
-                if (enabled) {
-                    try {
-                        router.addPortMapping(port, port, 0);
-                        String message = "Successfully forwarding port " + port;
-
-                        if (httpsPort != 0 && httpsPort != port) {
-                            router.addPortMapping(httpsPort, httpsPort, 0);
-                            message += " and port " + httpsPort;
-                        }
-                        message += ".";
-
-                        LOG.info(message);
-                        portForwardingStatus.setText(message);
-                    } catch (Throwable x) {
-                        String message = "Failed to create port forwarding.";
-                        LOG.warn(message, x);
-                        portForwardingStatus.setText(message + " See log for details.");
-                    }
-                }
-
-                // Delete NAT entry.
-                else {
-                    try {
-                        router.deletePortMapping(port, port);
-                        LOG.info("Deleted port mapping for port " + port);
-                        if (httpsPort != 0 && httpsPort != port) {
-                            router.deletePortMapping(httpsPort, httpsPort);
-                            LOG.info("Deleted port mapping for port " + httpsPort);
-                        }
-                    } catch (Throwable x) {
-                        LOG.warn("Failed to delete port mapping.", x);
-                    }
-                    portForwardingStatus.setText("Port forwarding disabled.");
-                }
-            }
-
-            //  Don't do it again if disabled.
-            if (!enabled && portForwardingFuture != null) {
-                portForwardingFuture.cancel(false);
-            }
-        }
-
-        private Router findRouter() {
-
-            try {
-                Router router = ClingRouter.findRouter(upnpService);
-                if (router != null) {
-                    return router;
-                }
-            } catch (Throwable x) {
-                LOG.warn("Failed to find UPnP router using Cling library.", x);
-            }
-
-            try {
-                Router router = NATPMPRouter.findRouter();
-                if (router != null) {
-                    return router;
-                }
-            } catch (Throwable x) {
-                LOG.warn("Failed to find NAT-PMP router.", x);
-            }
-
-            return null;
-        }
-    }
-
     private class URLRedirectionTask extends Task {
 
         @Override
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java b/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
index 2a5ac369..0de191e4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
@@ -85,7 +85,6 @@ public class SettingsService {
     private static final String KEY_LDAP_SEARCH_FILTER = "LdapSearchFilter";
     private static final String KEY_LDAP_AUTO_SHADOWING = "LdapAutoShadowing";
     private static final String KEY_GETTING_STARTED_ENABLED = "GettingStartedEnabled";
-    private static final String KEY_PORT_FORWARDING_ENABLED = "PortForwardingEnabled";
     private static final String KEY_PORT = "Port";
     private static final String KEY_HTTPS_PORT = "HttpsPort";
     private static final String KEY_URL_REDIRECTION_ENABLED = "UrlRedirectionEnabled";
@@ -156,7 +155,6 @@ public class SettingsService {
     private static final String DEFAULT_LDAP_MANAGER_PASSWORD = null;
     private static final String DEFAULT_LDAP_SEARCH_FILTER = "(sAMAccountName={0})";
     private static final boolean DEFAULT_LDAP_AUTO_SHADOWING = false;
-    private static final boolean DEFAULT_PORT_FORWARDING_ENABLED = false;
     private static final boolean DEFAULT_GETTING_STARTED_ENABLED = true;
     private static final int DEFAULT_PORT = 80;
     private static final int DEFAULT_HTTPS_PORT = 0;
@@ -187,7 +185,8 @@ public class SettingsService {
     private static final List<String> OBSOLETE_KEYS = Arrays.asList("PortForwardingPublicPort", "PortForwardingLocalPort",
             "DownsamplingCommand", "DownsamplingCommand2", "DownsamplingCommand3", "AutoCoverBatch", "MusicMask",
             "VideoMask", "CoverArtMask, HlsCommand", "HlsCommand2", "JukeboxCommand", 
-            "CoverArtFileTypes", "UrlRedirectCustomHost", "CoverArtLimit", "StreamPort");
+            "CoverArtFileTypes", "UrlRedirectCustomHost", "CoverArtLimit", "StreamPort",
+            "PortForwardingEnabled");
 
     private static final String LOCALES_FILE = "/org/libresonic/player/i18n/locales.txt";
     private static final String THEMES_FILE = "/org/libresonic/player/theme/themes.txt";
@@ -670,14 +669,6 @@ public class SettingsService {
         setBoolean(KEY_GETTING_STARTED_ENABLED, isGettingStartedEnabled);
     }
 
-    public boolean isPortForwardingEnabled() {
-        return getBoolean(KEY_PORT_FORWARDING_ENABLED, DEFAULT_PORT_FORWARDING_ENABLED);
-    }
-
-    public void setPortForwardingEnabled(boolean isPortForwardingEnabled) {
-        setBoolean(KEY_PORT_FORWARDING_ENABLED, isPortForwardingEnabled);
-    }
-
     public int getPort() {
         return getInt(KEY_PORT, DEFAULT_PORT);
     }
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java b/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java
index df4178d1..8c28eeab 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java
@@ -33,7 +33,6 @@ import org.fourthline.cling.support.model.ProtocolInfos;
 import org.fourthline.cling.support.model.dlna.DLNAProfiles;
 import org.fourthline.cling.support.model.dlna.DLNAProtocolInfo;
 import org.libresonic.player.Logger;
-import org.libresonic.player.domain.Version;
 import org.libresonic.player.service.upnp.ApacheUpnpServiceConfiguration;
 import org.libresonic.player.service.upnp.FolderBasedContentDirectory;
 import org.libresonic.player.service.upnp.MSMediaReceiverRegistrarService;
@@ -51,7 +50,6 @@ public class UPnPService {
     private static final Logger LOG = Logger.getLogger(UPnPService.class);
 
     private SettingsService settingsService;
-    private VersionService versionService;
     private UpnpService upnpService;
     private FolderBasedContentDirectory folderBasedContentDirectory;
 
@@ -114,8 +112,6 @@ public class UPnPService {
         DeviceType type = new UDADeviceType("MediaServer", 1);
 
         // TODO: DLNACaps
-        Version version = versionService.getLocalVersion();
-        String versionString = version == null ? null : version.toString();
 
         DeviceDetails details = new DeviceDetails(serverName, new ManufacturerDetails(serverName),
                 new ModelDetails(serverName),
@@ -154,7 +150,7 @@ public class UPnPService {
 
         // For compatibility with Microsoft
         LocalService<MSMediaReceiverRegistrarService> receiverService = new AnnotationLocalServiceBinder().read(MSMediaReceiverRegistrarService.class);
-        receiverService.setManager(new DefaultServiceManager<MSMediaReceiverRegistrarService>(receiverService, MSMediaReceiverRegistrarService.class));
+        receiverService.setManager(new DefaultServiceManager<>(receiverService, MSMediaReceiverRegistrarService.class));
 
         return new LocalDevice(identity, type, details, new Icon[]{icon}, new LocalService[]{contentDirectoryservice, connetionManagerService, receiverService});
     }
@@ -180,10 +176,6 @@ public class UPnPService {
         this.settingsService = settingsService;
     }
 
-    public void setVersionService(VersionService versionService) {
-        this.versionService = versionService;
-    }
-
     public void setFolderBasedContentDirectory(FolderBasedContentDirectory folderBasedContentDirectory) {
         this.folderBasedContentDirectory = folderBasedContentDirectory;
     }
diff --git a/libresonic-main/src/main/resources/applicationContext-service.xml b/libresonic-main/src/main/resources/applicationContext-service.xml
index aebdb8c9..35289f80 100644
--- a/libresonic-main/src/main/resources/applicationContext-service.xml
+++ b/libresonic-main/src/main/resources/applicationContext-service.xml
@@ -123,7 +123,6 @@
 
     <bean id="networkService" class="org.libresonic.player.service.NetworkService" init-method="init">
         <property name="settingsService" ref="settingsService"/>
-        <property name="upnpService" ref="upnpService"/>
     </bean>
 
     <bean id="playerService" class="org.libresonic.player.service.PlayerService" init-method="init">
@@ -206,7 +205,6 @@
 
     <bean id="upnpService" class="org.libresonic.player.service.UPnPService" init-method="init">
         <property name="settingsService" ref="settingsService"/>
-        <property name="versionService" ref="versionService"/>
         <property name="folderBasedContentDirectory" ref="folderBasedContentDirectory"/>
     </bean>
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_bg.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_bg.properties
index f8cb27ac..7efdcc05 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_bg.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_bg.properties
@@ -310,10 +310,6 @@ musicfoldersettings.nopath = \u041C\u043E\u043B\u044F \u043F\u043E\u0441\u043E\u
 # networkSettings.jsp
 networksettings.text = \u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439\u0442\u0435 \u043E\u043F\u0446\u0438\u0438\u0442\u0435 \u043F\u043E-\u0434\u043E\u043B\u0443 \u0437\u0430 \u0434\u0430 \u043D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u0435 \u043D\u0430\u0447\u0438\u043D\u0430 \u0437\u0430 \u0434\u043E\u0441\u0442\u044A\u043F \u0434\u043E \u0432\u0430\u0448\u0438\u044F Libresonic \u0441\u044A\u0440\u0432\u044A\u0440 \u043F\u0440\u0435\u0437 Internet.<br> \
                        \u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0438, \u043C\u043E\u043B\u044F \u043F\u0440\u043E\u0447\u0435\u0442\u0435\u0442\u0435 <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>\u0420\u044A\u043A\u043E\u0432\u043E\u0434\u0441\u0442\u0432\u043E\u0442\u043E</b></a> \u0437\u0430 \u043D\u043E\u0432\u0438 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438.
-networksettings.portforwardingenabled = \u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0432\u0430\u0448\u0438\u044F \u0440\u0443\u0442\u0435\u0440 \u0434\u0430 \u0440\u0430\u0437\u0440\u0435\u0448\u0430\u0432\u0430 \u0432\u0445\u043E\u0434\u044F\u0449\u0438 \u0432\u0440\u044A\u0437\u043A\u0438 \u043A\u044A\u043C Libresonic (\u0447\u0440\u0435\u0437 UPnP \u0438\u043B\u0438 NAT-PMP \u043F\u0440\u0435\u043D\u0430\u0441\u043E\u0447\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043E\u0440\u0442\u0430).
-networksettings.portforwardinghelp = \u0410\u043A\u043E \u0440\u0443\u0442\u0435\u0440\u0430 \u0432\u0438 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043D \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E, \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043D\u0430\u043F\u0440\u0430\u0432\u0438\u0442\u0435 \u0442\u043E\u0432\u0430 \u0440\u044A\u0447\u043D\u043E. \
-            \u0421\u043B\u0435\u0434\u0432\u0430\u0439\u0442\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u0438\u0442\u0435 \u043E\u0442 <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            \u0422\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u043F\u0440\u0435\u043D\u0430\u0441\u043E\u0447\u0438\u0442\u0435 \u043F\u043E\u0440\u0442 {0} \u043A\u044A\u043C \u043A\u043E\u043C\u043F\u044E\u0442\u044A\u0440\u0430 \u0441 \u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D Libresonic \u0441\u044A\u0440\u0432\u044A\u0440.
 networksettings.urlredirectionenabled = \u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439\u0442\u0435 \u043B\u0435\u0441\u043D\u043E \u0437\u0430\u043F\u043E\u043C\u043D\u044F\u0449 \u0441\u0435 \u0430\u0434\u0440\u0435\u0441 \u0437\u0430 \u0434\u043E\u0441\u0442\u044A\u043F \u0434\u043E \u0432\u0430\u0448\u0438\u044F\u0442 \u0441\u044A\u0440\u0432\u044A\u0440.
 networksettings.status = \u0421\u0442\u0430\u0442\u0443\u0441:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ca.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ca.properties
index 98a598c1..7ead0ded 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ca.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ca.properties
@@ -345,10 +345,6 @@ musicfoldersettings.organizebyfolderstructure.description = Usi aquesta opci\u00
 # networkSettings.jsp
 networksettings.text = Usi els seg\u00FCents par\u00E0metres per a controlar com s'accedeix al seu servidor Libresonic a trav\u00E9s de Internet.<br> \
                        Si experimenta algun tipus de contratemps, visiti la guia de <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Primers passos</b></a>.
-networksettings.portforwardingenabled = Configuri el seu router de manera autom\u00E0tica per tal de permetre les connexions entrants a Libresonic (usant reenviament de ports UPnP o NAT-PMP).
-networksettings.portforwardinghelp = Si el seu router no es pot configurar de manera autom\u00E0tica pot intentar configurar-lo de manera manual. \
-            Pot intentar seguir les instruccions de <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Ha de reenviar el port {0} a l'ordinador on s'est\u00E0 executant el servidor de Libresonic.
 networksettings.urlredirectionenabled = Accedeixi al seu servidor a trav\u00E9s de Internet usant una direcci\u00F3 f\u00E0cil de recordar.
 networksettings.status = Estat:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties
index 79ed92ff..9b56baab 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties
@@ -400,10 +400,6 @@ musicfoldersettings.organizebyfolderstructure.description = Tuto volbu pou\u017E
 # networkSettings.jsp
 networksettings.text = Pomoc\u00ED n\u00ED\u017Ee uveden\u00FDch nastaven\u00ED ur\u010Dete, jak p\u0159istupovat k va\u0161emu serveru Libresonic z internetu.<br> \
                        Pokud naraz\u00EDte na pot\u00ED\u017Ee, p\u0159e\u010Dt\u011Bte si p\u0159\u00EDru\u010Dku <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Za\u010D\u00EDn\u00E1me</b></a>.
-networksettings.portforwardingenabled = Automaticky nakonfigurovat router tak, aby umo\u017Enil p\u0159\u00EDchoz\u00ED p\u0159ipojen\u00ED k Libresonicu (pomoc\u00ED UPnP nebo p\u0159esm\u011Brov\u00E1n\u00ED port\u016F NAT-PMP).
-networksettings.portforwardinghelp = Pokud v\u00E1\u0161 router nem\u016F\u017Ee b\u00FDt nakonfigurov\u00E1n automaticky, m\u016F\u017Eete ho nastavit ru\u010Dn\u011B. \
-            Postupujte podle pokyn\u016F na <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Mus\u00EDte p\u0159esm\u011Brovat port {0} na po\u010D\u00EDta\u010D se spu\u0161t\u011Bn\u00FDm serverem Libresonic.
 networksettings.urlredirectionenabled = P\u0159istupovat k serveru z internetu pomoc\u00ED snadno zapamatovateln\u00E9 adresy.
 networksettings.status = Stav:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_da.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_da.properties
index d03d9a74..f09140f8 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_da.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_da.properties
@@ -366,10 +366,6 @@ playersettings.clone = Klon afspiller
 
 # NetworkSettings.jsp
 networksettings.text = Brug indstillingerne nedenfor til at kontrollere, hvordan adgangen til din Libresonic server skal v\u00E6re over internettet.
-networksettings.portforwardingenabled = Automatisk konfigurere routeren til at tillade indg\u00E5ende forbindelser til Libresonic (UPnP port forwarding).
-networksettings.portforwardinghelp = Hvis din router ikke kan ops\u00E6ttes automatisk, skal du s\u00E6tte den op manuelt. \
-            F\u00F8lg vejledningen p\u00E5 <a href="http://portforward.com/" target="_blank">portforward.com </a>. \
-            Du skal forwarde port {0} til computeren, som k\u00F8rer Libresonic server.
 networksettings.urlredirectionenabled = F\u00E5 adgang til din server over internettet ved hj\u00E6lp af en adresse, der er let at huske.
 networksettings.status = Status:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties
index 1c91fc68..d7284817 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties
@@ -398,12 +398,7 @@ musicfoldersettings.organizebyfolderstructure.description = Verwende diese Funkt
 
 # networkSettings.jsp
 networksettings.text = Verwenden sie die folgenden Einstellungen um den Zugang zu ihrem Libresonic-Server \u00FCber das Internet einzurichten.
-networksettings.portforwardingenabled = Erlaube automatische Konfiguration des Routers f\u00FCr eingehende Verbindungen zu Libresonic (UPnP Port forwarding).
-networksettings.urlredirectionenabled = Greifen sie \u00FCber das Internet auf ihren Server zu, mithilfe einer "leicht-zu-merken" Adresse.
 networksettings.status = Status:
-networksettings.portforwardinghelp = Wenn Ihr Router nicht automatisch konfiguriert wird k\u00F6nnen sie dies auch manuell tun. \
-            Folgen sie der Anleitung unter <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Sie m\u00FCssen den Port {0} auf ihren Computer weiterleiten um den Libresonic Server zu erreichen.
 networksettings.normalurl = Verwende
 networksettings.customurl = Verwende Benutzerdefinierte URL (erweitert)
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_el.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_el.properties
index a5ee9aed..9fcaf4fe 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_el.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_el.properties
@@ -309,10 +309,6 @@ musicfoldersettings.nopath = \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u
 # networkSettings.jsp
 networksettings.text = \u03A7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03AE\u03C3\u03C4\u03B5 \u03C4\u03B9\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03C0\u03C1\u03BF\u03C3\u03B4\u03B9\u03BF\u03C1\u03AF\u03C3\u03B5\u03C4\u03B5 \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7 \u03C3\u03C4\u03BF\u03BD Libresonic \u03C5\u03C0\u03BF\u03BB\u03BF\u03B3\u03B9\u03C3\u03C4\u03AE \u03C3\u03B1\u03C2 \u03BC\u03AD\u03C3\u03C9 \u03AF\u03BD\u03C4\u03B5\u03C1\u03BD\u03B5\u03C4.<br> \
                        \u0391\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03CC\u03B2\u03BB\u03B7\u03BC\u03B1, \u03C3\u03C5\u03BC\u03B2\u03BF\u03C5\u03BB\u03B5\u03C5\u03C4\u03AE\u03C4\u03B5 \u03C4\u03B9\u03C2 <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>\u03A0\u03CE\u03C2 \u03BD\u03B1 \u03B1\u03C1\u03C7\u03AF\u03C3\u03B5\u03C4\u03B5</b></a> \u03BF\u03B4\u03B7\u03B3\u03AF\u03B5\u03C2.
-networksettings.portforwardingenabled = \u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03B1 \u03C1\u03C5\u03B8\u03BC\u03AF\u03C3\u03C4\u03B5 \u03C4\u03BF\u03BD \u03B4\u03C1\u03BF\u03BC\u03BF\u03BB\u03BF\u03B3\u03B7\u03C4\u03AE \u03C3\u03B1\u03C2 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03C4\u03C1\u03AD\u03C0\u03B5\u03B9 \u03B5\u03B9\u03C3\u03B5\u03C1\u03C7\u03CC\u03BC\u03B5\u03BD\u03B5\u03C2 \u03C3\u03C5\u03BD\u03B4\u03AD\u03C3\u03B5\u03B9\u03C2 \u03C3\u03C4\u03BF Libresonic (\u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03CE\u03BD\u03C4\u03B1\u03C2 UPnP or NAT-PMP \u03C0\u03C1\u03BF\u03CE\u03B8\u03B7\u03C3\u03B7 \u03C4\u03C9\u03BD \u03B8\u03C5\u03C1\u03CE\u03BD).
-networksettings.portforwardinghelp = \u0391\u03BD \u03BF \u03B4\u03C1\u03BF\u03BC\u03BF\u03BB\u03BF\u03B3\u03B7\u03C4\u03AE\u03C2 \u03C3\u03B1\u03C2 \u03B4\u03B5\u03BD \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF \u03BD\u03B1 \u03C1\u03C5\u03B8\u03BC\u03B9\u03C3\u03C4\u03B5\u03AF \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03B1, \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03C4\u03BF\u03BD \u03C1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03C4\u03B5 \u03B5\u03C3\u03B5\u03AF\u03C2. \
-            \u0391\u03BA\u03BF\u03BB\u03BF\u03C5\u03B8\u03AE\u03C3\u03C4\u03B5 \u03C4\u03B9\u03C2 \u03BF\u03B4\u03B7\u03B3\u03AF\u03B5\u03C2 \u03C3\u03C4\u03BF <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            \u03A0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C0\u03C1\u03BF\u03C9\u03B8\u03AE\u03C3\u03B5\u03C4\u03B5 \u03C4\u03B7\u03BD \u03B8\u03CD\u03C1\u03B1 {0} \u03C3\u03C4\u03BF\u03BD \u03C5\u03C0\u03BF\u03BB\u03BF\u03B3\u03B9\u03C3\u03C4\u03AE \u03C0\u03BF\u03C5 \u03C4\u03C1\u03AD\u03C7\u03B5\u03B9 \u03C4\u03BF Libresonic \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03CC.
 networksettings.urlredirectionenabled = \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7 \u03C3\u03C4\u03BF\u03BD \u03C5\u03C0\u03BF\u03BB\u03BF\u03B3\u03B9\u03C3\u03C4\u03AE \u03C3\u03B1\u03C2 \u03BC\u03AD\u03C3\u03C9 \u03AF\u03BD\u03C4\u03B5\u03C1\u03BD\u03B5\u03C4 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03CC\u03BD\u03C4\u03B1\u03C2 \u03BC\u03B9\u03B1 \u03B5\u03CD\u03BA\u03BF\u03BB\u03B7 \u03C0\u03C1\u03BF\u03C2 \u03B1\u03C0\u03BF\u03BC\u03BD\u03B7\u03BC\u03CC\u03BD\u03B5\u03C5\u03C3\u03B7 \u03B4\u03B9\u03B5\u03CD\u03B8\u03C5\u03BD\u03C3\u03B7.
 networksettings.status = \u039A\u03B1\u03C4\u03AC\u03C3\u03C4\u03B1\u03C3\u03B7:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
index 88d4fd45..3b44bf50 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
@@ -460,10 +460,6 @@ musicfoldersettings.organizebyfolderstructure.description = Use this option to b
 # networkSettings.jsp
 networksettings.text = Use the settings below to control how to access your Libresonic server over the Internet.<br> \
                        If you experience difficulties, please consult the <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Getting started</b></a> guide.
-networksettings.portforwardingenabled = Automatically configure your router to allow incoming connections to Libresonic (using UPnP or NAT-PMP port forwarding).
-networksettings.portforwardinghelp = If your router can''t be configured automatically you can set it up manually. \
-            Follow the instructions on <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            You must forward port {0} to the computer running the Libresonic server.
 networksettings.urlredirectionenabled = Access your server over the Internet using an easy-to-remember address.
 networksettings.status = Status:
 networksettings.normalurl = Use
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties
index f599dc15..bd8057d1 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties
@@ -398,10 +398,6 @@ musicfoldersettings.organizebyfolderstructure.description = Kasuta seda valikut,
 # networkSettings.jsp
 networksettings.text = Kasuta seda seadet, et hallata ligipääsu Libresonicu serverisse Interneti kaudu.<br> \
                        Kui ilmneb raskusi siis tutvuge <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Sissejuhatuse</b></a> peatükiga.
-networksettings.portforwardingenabled = Automaatselt seadista oma ruuter, et Libresonicu ühendused oleks alati lubatud (kasutatakse UPnP või NAT-PMP pordi saatmist).
-networksettings.portforwardinghelp = Ruuterit on ka võimalik seadistada käsitsi, kui automaatselt ei saa. \
-            Järgi juhendeid portaalil <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Sa pead saatma porti {0}, et Libresonicu server töötaks korrektselt.
 networksettings.urlredirectionenabled = Hangi hästi meeldejääv aadress, et ligipääs oma serverile Interneti kaudu oleks lihtsustatud.
 networksettings.status = Olek:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fi.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fi.properties
index 68951b39..17ad1f3a 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fi.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fi.properties
@@ -295,10 +295,6 @@ musicfoldersettings.nopath = M\u00E4\u00E4rit\u00E4 kansion sijainti.
 
 # networkSettings.jsp
 networksettings.text = K\u00E4yt\u00E4 alla olevia asetuksia m\u00E4\u00E4ritt\u00E4\u00E4ksesi p\u00E4\u00E4syn Libresonic serverille internetist\u00E4 k\u00E4sin.
-networksettings.portforwardingenabled = M\u00E4\u00E4rit\u00E4 reititin automaattisesti hyv\u00E4ksym\u00E4\u00E4n yhteydet internetist\u00E4 k\u00E4sin Libresonic ohjelmaan (UPnP portin uudelleen ohjaus).
-networksettings.portforwardinghelp = Jos reititint\u00E4 ei voi m\u00E4\u00E4ritt\u00E4\u00E4 automaattisesti, voit tehd\u00E4 sen manuaalisesti. \
-            Lue ohjeet <a href="http://portforward.com/" target="_blank">portforward.com sivustolta</a>. \
-            Sinun tulee uudelleen ohjata portti {0} sille tietokoneelle, miss\u00E4 Libresonic serveri on.
 networksettings.urlredirectionenabled = P\u00E4\u00E4sy serverille internetist\u00E4 k\u00E4sin k\u00E4ytt\u00E4m\u00E4ll\u00E4 helposti muistettavaa verkko-osoitetta.
 networksettings.status = Tilanne:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fr.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fr.properties
index 97543a69..2fd2aafd 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fr.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fr.properties
@@ -363,10 +363,6 @@ musicfoldersettings.nopath = Veuillez indiquer un dossier.
 # networkSettings.jsp
 networksettings.text = Compl\u00E9tez les options ci-dessous afin de d\u00E9finir comment acc\u00E9der \u00E0 votre serveur Libresonic depuis Internet.<br> \
                        Si vous rencontrez des probl\u00E8mes, consultez le guide de <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>D\u00E9marrage rapide</b></a>.
-networksettings.portforwardingenabled = Configurer automatiquement le routeur pour autoriser les connexions entrantes vers Libresonic (transit par port UPnP).
-networksettings.portforwardinghelp = Si votre routeur ne peut pas \u00EAtre configur\u00E9 automatiquement, vous pouvez le faire manuellement en suivant \
-            les instructions de <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Vous devrez alors ouvrir le port TCP {0} de l''ordinateur sur lequel est install\u00E9 Libresonic.
 networksettings.urlredirectionenabled = Acc\u00E9dez \u00E0 votre serveur depuis Internet en utilisant une adresse facile \u00E0 retenir.
 networksettings.status = Statut :
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_it.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_it.properties
index 5e9df98b..af3031a7 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_it.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_it.properties
@@ -307,10 +307,6 @@ musicfoldersettings.nopath = Specifica una cartella.
 # networkSettings.jsp
 networksettings.text = Utilizza le impostazioni qui sotto per regolare l'accesso a Libresonic da internet.<br> \
                        Se hai problemi, per favore consulta la guida di <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Introduzione a Libresonic</b></a>.
-networksettings.portforwardingenabled = Configura automaticamente il tuo router per permettere le connessioni in entrata per Libresonic (utilizzando il port forwarding UPnP o NAT-PMP).
-networksettings.portforwardinghelp = Se il tuo router non \u00E8 configurabile automaticamente, puoi configurarlo manualmente. \
-            Segui le istruzioni su <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Devi aprire la porta {0} per il computer sul quale \u00E8 in esecuzione Libresonic.
 networksettings.urlredirectionenabled = Accedi al tuo server attraverso internet utilizzando un indirizzo facile da ricordare.
 networksettings.status = Status:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties
index c009ef99..936b1af0 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties
@@ -420,10 +420,6 @@ musicfoldersettings.organizebyfolderstructure.description = \u30C7\u30A3\u30EC\u
 # networkSettings.jsp
 networksettings.text = \u30A4\u30F3\u30BF\u30FC\u30CD\u30C3\u30C8\u7D4C\u7531\u3067 Libresonic \u30B5\u30FC\u30D0\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u65B9\u6CD5\u3092\u5236\u5FA1\u3059\u308B\u305F\u3081\u306B\u306F\u3001\u4EE5\u4E0B\u306E\u8A2D\u5B9A\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002<br> \
                        \u554F\u984C\u304C\u767A\u751F\u3057\u305F\u5834\u5408\u306F <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Getting started</b></a> \u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-networksettings.portforwardingenabled = \u81EA\u52D5\u7684\u306B Libresonic \u3078\u306E\u63A5\u7D9A\u3092\u8A31\u53EF(UPnP\u307E\u305F\u306FNAT-PMP\u306E\u30DD\u30FC\u30C8\u8EE2\u9001\u3092\u4F7F\u7528)\u3059\u308B\u3088\u3046\u306B\u30EB\u30FC\u30BF\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-networksettings.portforwardinghelp = \u30EB\u30FC\u30BF\u304C\u81EA\u52D5\u7684\u306B\u8A2D\u5B9A\u3067\u304D\u306A\u3044\u5834\u5408\u306F\u3001\u624B\u52D5\u3067\u8A2D\u5B9A\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\
-            <a href="http://portforward.com/" target="_blank">portforward.com</a> \u306E\u6307\u793A\u306B\u5F93\u3063\u3066\u304F\u3060\u3055\u3044\u3002\
-            Libresonic \u30B5\u30FC\u30D0\u3092\u5B9F\u884C\u3057\u3066\u3044\u308B\u30B3\u30F3\u30D4\u30E5\u30FC\u30BF\u306B\u30DD\u30FC\u30C8 {0} \u756A\u3092\u8EE2\u9001\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 networksettings.urlredirectionenabled = \u7C21\u6F54\u306A\u30A2\u30C9\u30EC\u30B9\u3092\u4F7F\u7528\u3057\u3066\u3001\u30A4\u30F3\u30BF\u30FC\u30CD\u30C3\u30C8\u7D4C\u7531\u3067\u30B5\u30FC\u30D0\u306B\u30A2\u30AF\u30BB\u30B9\u3057\u307E\u3059\u3002
 networksettings.status = \u72B6\u614B:\u0081@
 networksettings.normalurl = \u4F7F\u7528\u3059\u308B
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ko.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ko.properties
index c0ee51eb..c721ad59 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ko.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ko.properties
@@ -395,10 +395,6 @@ musicfoldersettings.organizebyfolderstructure.description = Use this option to b
 # networkSettings.jsp
 networksettings.text = \uC778\uD130\uB137\uC744 \uD1B5\uD574 \uC11C\uBE0C\uC18C\uB2C9 \uC11C\uBC84\uC5D0 \uC811\uADFC\uD558\uB294 \uBC29\uBC95\uC744 \uC124\uC815\uD569\uB2C8\uB2E4..<br> \
                        	\uB9CC\uC57D \uC124\uC815\uC5D0 \uC774\uC0C1\uC774 \uC788\uB2E4\uBA74 \uAC00\uC774\uB4DC\uB97C \uCC38\uACE0\uD558\uC2ED\uC2DC\uC624. <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>\uC2DC\uC791\uD558\uAE30</b></a>
-networksettings.portforwardingenabled = \uC11C\uBE0C\uC18C\uB2C9\uC5D0 \uC790\uB3D9\uC73C\uB85C \uC5F0\uACB0\uB418\uB3C4\uB85D  \uB77C\uC6B0\uD130\uB97C \uAD6C\uC131\uD569\uB2C8\uB2E4. (UPnP \uB098 NAT-PMP \uD3EC\uD2B8 \uD3EC\uC6CC\uB529 \uC0AC\uC6A9\uD558\uAE30).
-networksettings.portforwardinghelp = \uB77C\uC6B0\uD130\uAC00 \uC790\uB3D9\uC73C\uB85C \uAD6C\uC131\uB418\uC9C0 \uC54A\uB294\uB2E4\uBA74 \uC218\uB3D9\uC73C\uB85C \uAD6C\uC131\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \
-            <a href="http://portforward.com/" target="_blank">portforward.com</a> \uC758 \uC9C0\uCE68\uC5D0 \uB530\uB974\uC2ED\uC2DC\uC624. \
-            	\uB2F9\uC2E0\uC740 {0}\uBC88 \uD3EC\uD2B8\uB97C \uC11C\uBE0C\uC18C\uB2C9 \uC11C\uBC84\uB85C \uD3EC\uC6CC\uB529 \uD574\uC57C \uD569\uB2C8\uB2E4..
 networksettings.urlredirectionenabled = \uAE30\uC5B5\uD558\uAE30 \uC26C\uC6B4 \uC8FC\uC18C\uB85C \uC778\uD130\uB137\uC744 \uD1B5\uD574 \uC11C\uBE0C\uC18C\uB2C9 \uC11C\uBC84\uC5D0 \uC5F0\uACB0\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 networksettings.status = \uC0C1\uD0DC:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_nl.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_nl.properties
index fa0970bf..005a35dd 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_nl.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_nl.properties
@@ -406,10 +406,6 @@ musicfoldersettings.organizebyfolderstructure.description = Gebruik deze optie o
 # networkSettings.jsp
 networksettings.text = Gebruik de instellingen hieronder om te bepalen hoe jouw Libresonic-server over het Internet bereikbaar is .<br> \
                        Als er problemen zijn, raadpleeg dan de <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Beginnersgids</b></a>.
-networksettings.portforwardingenabled = Configureer automatisch je router om inkomende verbindingen naar Libresonic toe te staan. (UPnP of NAT-PMP poort forwarding).
-networksettings.portforwardinghelp = Als jouw router niet automatisch kan worden geconfigureerd, kun je dit handmatig instellen. \
-            Volg de instructies op <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Je dient poort {0} door te sturen naar de computer waar de Libresonic server actief is.
 networksettings.urlredirectionenabled = Krijg toegang tot je server over het Internet met een gemakkelijk te onthouden adres.
 networksettings.status = Status:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pl.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pl.properties
index f3f5dd3a..72ba6f05 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pl.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pl.properties
@@ -312,10 +312,6 @@ musicfoldersettings.nopath = Prosz\u0119 okre\u015Bli\u0107 folder.
 # networkSettings.jsp
 networksettings.text = U\u017Cyj poni\u017Cszych ustawie\u0144, aby kontrolowa\u0107 jak server Libresonic jest dost\u0119pne poprzez Internet.<br> \
                        Je\u015Bli masz problemy, zajrzyj do <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Instrukcji Obs\u0142ugi</b></a>.
-networksettings.portforwardingenabled = Skonfiguruj router automatyczne, aby zezwoli\u0107 na po\u0142\u0105czenia przychodz\u0105ce do Libresonic (przekazywanie port\u00F3w UPnP lub NAT-PMP).
-networksettings.portforwardinghelp = Je\u015Bli router nie mo\u017Ce zostac skonfigurowanie automatycznie, mo\u017Cna ustawi\u0107 go r\u0119cznie. \
-            Post\u0119puj zgodnie z instrukcj\u0105 na <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Musisz przekierowa\u0107 port {0} do komputera na kt\u00F3rym znajduje si\u0119 serwer Libresonic
 networksettings.urlredirectionenabled = Uzyskaj dost\u0119p do serwera przez Internet poprzez \u0142atwy do zapami\u0119tania adres.
 networksettings.status = Status:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pt.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pt.properties
index 690517db..d3e9905f 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pt.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pt.properties
@@ -306,10 +306,6 @@ musicfoldersettings.nopath = Por favor especifique a pasta.
 # networkSettings.jsp
 networksettings.text = Use as configura\u00E7\u00F5es abaixo para controlar a forma de aceder ao servidor do Libresonic atrav\u00E9s da Internet .<br> \
                        Se tiver problemas, consulte o guia dos <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>primeiros passos</b></a>. (em ingl\u00EAs)
-networksettings.portforwardingenabled = Configurar autom\u00E1ticamente o seu router para permitir liga\u00E7\u00F5es de entrada para o Libresonic (usando UPnP ou o encaminhamento de porta NAT-PMP).
-networksettings.portforwardinghelp = Se o seu router n\u00E3o puder ser configurado autom\u00E1ticamente, pode configur\u00E1-lo manualmente. \
-            Siga as instru\u00E7\u00F5es em <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Deve encaminhar a porta {0} para o computador que est\u00E1 a executar o servidor Libresonic.
 networksettings.urlredirectionenabled = Aceda ao seu servidor na Internet usando um endere\u00E7o f\u00E1cil de lembrar.
 networksettings.status = Estado:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ru.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ru.properties
index 880809a5..b2c92bfe 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ru.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ru.properties
@@ -293,7 +293,6 @@ musicfoldersettings.nopath = \u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u043F\u
 
 # networkSettings.jsp
 networksettings.text = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u044D\u0442\u0438 \u043E\u043F\u0446\u0438\u0438 \u0434\u043B\u044F \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u043A \u0432\u0430\u0448\u0435\u043C\u0443 \u0441\u0435\u0440\u0432\u0435\u0440\u0443 \u0447\u0435\u0440\u0435\u0437 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442.
-networksettings.portforwardingenabled = \u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0432\u0430\u0448 \u0440\u043E\u0443\u0442\u0435\u0440 \u0434\u043B\u044F \u043F\u0440\u0438\u043D\u044F\u0442\u0438\u044F \u0432\u0445\u043E\u0434\u044F\u0449\u0438\u0445 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0439 \u043A Libresonic (UPnP port forwarding).
 networksettings.urlredirectionenabled = \u0421\u0434\u0435\u043B\u0430\u0439\u0442\u0435 \u0432\u0430\u0448 \u0441\u0435\u0440\u0432\u0435\u0440 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u043C \u043F\u043E \u043B\u0435\u0433\u043A\u043E\u0437\u0430\u043F\u043E\u043C\u0438\u043D\u0430\u044E\u0449\u0435\u043C\u0443\u0441\u044F \u0430\u0434\u0440\u0435\u0441\u0443.
 networksettings.status = \u0421\u0442\u0430\u0442\u0443\u0441:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sl.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sl.properties
index a6696648..4492d6b2 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sl.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sl.properties
@@ -380,10 +380,6 @@ musicfoldersettings.organizebyfolderstructure.description = Uporabite to mo\u017
 # networkSettings.jsp
 networksettings.text = Uporabi spodnje nastavitve za nadzor dostopa do va\u0161ega Libresonic stre\u017Enika na Internetu.<br> \
                        \u010Ce naletite na te\u017Eave, si prosimo oglejte <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Uvod</b></a> k programu.
-networksettings.portforwardingenabled = Samodejno nastavi usmerjevalnik, da omogo\u010Di povezavo do Libresonic stre\u017Enika (z uporabo UPnP ali NAT-PMP posredovanja vrat).
-networksettings.portforwardinghelp = \u010Ce va\u0161ega usmerjevalnika ni mo\u010D samodejno nastaviti, ga lahko nastavite ro\u010Dno. \
-            Sledite navodilom na <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Posredovati morate vrata {0} do ra\u010Dunalnika s Libresonic stre\u017Enikom.
 networksettings.urlredirectionenabled = Dostopajte do svojega stre\u017Enika preko interneta z uporabo naslova, ki si ga je lahko zapomniti.
 networksettings.status = Stanje:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sv.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sv.properties
index efc45848..d48ecf3f 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sv.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sv.properties
@@ -311,10 +311,6 @@ musicfoldersettings.nopath = V\u00E4nligen specificera en s\u00F6kv\u00E4g.
 # networkSettings.jsp
 networksettings.text = Anv\u00E4nd inst\u00E4llningarna nedan f\u00F6r att f\u00E5 tillg\u00E5ng till Libresonicserver via internet.<br> \
                        Om du f\u00E5r problem, v\u00E4nligen konsultera <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Att komma ig\u00E5ng</b></a> guiden.
-networksettings.portforwardingenabled = Automatiskt konfigurera din router f\u00F6r godk\u00E4nnande av inkommande anslutningar till Libresonic (via UPnP eller NAT-PMP port forwarding).
-networksettings.portforwardinghelp = Om din router inte kan bli konfigurerad automatiskt kan du s\u00E4tta upp den manuellt. \
-            F\u00F6lj instruktionerna p\u00E5 <a href="http://portforward.com/" target="_blank">portforward.com</a>. \
-            Du m\u00E5ste \u00F6ppna port {0} till datorn som har Libresonic installerad.
 networksettings.urlredirectionenabled = F\u00E5 tillg\u00E5ng till din server via internet genom att anv\u00E4nda en adress som \u00E4r l\u00E4tt att komma ih\u00E5g.
 networksettings.status = Status:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_CN.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_CN.properties
index 46a270e8..6f741f38 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_CN.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_CN.properties
@@ -383,10 +383,6 @@ musicfoldersettings.organizebyfolderstructure.description = \u4F7F\u7528\u8FD9\u
 # networkSettings.jsp
 networksettings.text = \u4EE5\u4E0B\u8BBE\u7F6E\u8BA9\u60A8\u900F\u8FC7\u7F51\u9645\u7F51\u8DEF\u5B58\u53D6Libresonic\u670D\u52A1\u5668.<br> \
                        \u6709\u4EFB\u4F55\u95EE\u9898, \u8BF7\u53C2\u8003 <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>\u521D\u6B21\u4F7F\u7528</b></a>\u624B\u518C.
-networksettings.portforwardingenabled = \u81EA\u52A8\u914D\u7F6E\u8DEF\u7531\u5668\u5B58\u53D6Libresonic\u670D\u52A1\u5668 (UPnP \u7AEF\u53E3\u8F6C\u53D1).
-networksettings.portforwardinghelp = \u5982\u679C\u8DEF\u7531\u65E0\u6CD5\u81EA\u52A8\u914D\u7F6E\uFF0C\u8BF7\u4F7F\u7528\u624B\u52A8\u914D\u7F6E.<br> \
-           \u4F9D\u7167 <a href="http://portforward.com/" target="_blank">portforward.com</a> \u7684\u8BF4\u660E<br>\
-           \u4F60\u5FC5\u987B\u8F6C\u53D1Port:{0}\u5230\u7535\u8111\u4E0A\u8FD0\u884C\u7684Libresonic\u670D\u52A1\u5668.
 networksettings.urlredirectionenabled = \u7528\u7B80\u5355\u597D\u8BB0\u7684\u7F51\u5740\u8FDE\u7EBF\u5230\u60A8\u7684\u670D\u52A1\u5668.
 networksettings.status = \u72B6\u6001:
 
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties
index 755426fb..4db8f876 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties
@@ -417,10 +417,6 @@ musicfoldersettings.organizebyfolderstructure.description = \u958B\u555F\u9019\u
 # networkSettings.jsp
 networksettings.text = \u4EE5\u4E0B\u8A2D\u5B9A\u8B93\u60A8\u900F\u904E\u7DB2\u969B\u7DB2\u8DEF\u5B58\u53D6Libresonic\u4F3A\u670D\u5668\u3002<br> \
                        \u6709\u4EFB\u4F55\u554F\u984C\uFF0C\u8ACB\u53C3\u8003 <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>\u521D\u6B21\u4F7F\u7528</b></a>\u624B\u518A\u3002
-networksettings.portforwardingenabled = \u81EA\u52D5\u914D\u7F6E\u8DEF\u7531\u5668\u5B58\u53D6 Libresonic \u4F3A\u670D\u5668 (UPnP port \u8F49\u767C)\u3002
-networksettings.portforwardinghelp = \u5982\u679C\u8DEF\u7531\u7121\u6CD5\u81EA\u52D5\u914D\u7F6E\uFF0C\u8ACB\u4F7F\u7528\u624B\u52D5\u914D\u7F6E\u3002<br> \
-           \u4F9D\u7167 <a href="http://portforward.com/" target="_blank">portforward.com</a> \u7684\u8AAA\u660E<br>\
-           \u60A8\u5FC5\u9808\u8F49\u767CPort {0}\u5230\u96FB\u8166\u4E0A\u904B\u884C\u7684Libresonic\u4F3A\u670D\u5668\u3002
 networksettings.urlredirectionenabled = \u7528\u7C21\u55AE\u597D\u8A18\u7684\u7DB2\u5740\u9023\u7DDA\u5230\u60A8\u7684\u4F3A\u670D\u5668\u3002
 networksettings.status = \u72C0\u614B\uFF1A
 networksettings.normalurl = Use
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp
index d34a3fc9..9a6a82fd 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp
@@ -19,7 +19,6 @@
         }
 
         function updateStatus(networkStatus) {
-            $("#portForwardingStatus").html(networkStatus.portForwardingStatusText);
             $("#urlRedirectionStatus").html(networkStatus.urlRedirectionStatusText);
             window.setTimeout("refreshStatus()", 1000);
         }
@@ -49,21 +48,6 @@
 <p style="padding-top:1em"><fmt:message key="networksettings.text"/></p>
 
 <form:form commandName="command" action="networkSettings.view" method="post">
-    <p style="padding-top:1em">
-        <form:checkbox id="portForwardingEnabled" path="portForwardingEnabled"/>
-        <label for="portForwardingEnabled"><fmt:message key="networksettings.portforwardingenabled"/></label>
-    </p>
-
-    <div style="padding-left:2em;max-width:60em">
-        <p>
-            <fmt:message key="networksettings.portforwardinghelp"><fmt:param>${command.port}</fmt:param></fmt:message>
-        </p>
-
-        <p class="detail">
-            <fmt:message key="networksettings.status"/>
-            <span id="portForwardingStatus" style="margin-left:0.25em"></span>
-        </p>
-    </div>
 
     <p style="padding-top:1em"><form:checkbox id="urlRedirectionEnabled" path="urlRedirectionEnabled"
                                               onclick="enableUrlRedirectionFields()"/>