diff --git a/README.md b/README.md
index d308c36f7..61e65fb3b 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ If you have any problems installing OpenWebRX, you should check out the <a href=
 
 Sometimes the actual error message is not at the end of the terminal output, you may have to look at the whole output to find it.
 
-If you want to run OpenWebRX on a remote server instead of *localhost*, do not forget to set *server_hostname* in `config_webrx.py`.
+If you want to run OpenWebRX on a remote server instead of *localhost*, do not forget to set *server_url* in `config_webrx.py`.
 
 ## Licensing
 
diff --git a/config_webrx.py b/config_webrx.py
index 34e480c6b..1cc79229c 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -36,7 +36,18 @@
 
 # ==== Server settings ====
 web_port=8073
-server_hostname="localhost" # If this contains an incorrect value, the web UI may freeze on load (it can't open websocket)
+
+# Set server_url to the (externally-visible) URL of the service,
+# without a method (ie, without http://)
+# (this need not have a trailing slash, though having it does no harm).
+#
+# When running locally, this will be simply localhost+port, but if the
+# service is running behind a reverse proxy, this must be the
+# externally visible URI.
+#
+# If this contains an incorrect value, the web UI may freeze on load (it can't open websocket)
+server_url="localhost:" + web_port
+
 max_clients=20
 
 # ==== Web GUI configuration ====
@@ -207,10 +218,10 @@
 
 nmux_memory = 50 #in megabytes. This sets the approximate size of the circular buffer used by nmux.
 
-#Look up external IP address automatically from icanhazip.com, and use it as [server_hostname]
+#Look up external IP address automatically from icanhazip.com, and use it as [server_url]
 """
 print "[openwebrx-config] Detecting external IP address..."
 import urllib2
-server_hostname=urllib2.urlopen("http://icanhazip.com").read()[:-1]
-print "[openwebrx-config] External IP address detected:", server_hostname
+server_url=urllib2.urlopen("http://icanhazip.com").read()[:-1]
+print "[openwebrx-config] External IP address detected:", server_url
 """
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index c7fd7c093..62b69b663 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1692,11 +1692,12 @@ String.prototype.startswith=function(str){ return this.indexOf(str) == 0; }; //h
 
 function open_websocket()
 {
-	//if(ws_url.startswith("ws://localhost:")&&window.location.hostname!="127.0.0.1"&&window.location.hostname!="localhost")
-	//{
-		//divlog("Server administrator should set <em>server_hostname</em> correctly, because it is left as <em>\"localhost\"</em>. Now guessing hostname from page URL.",1);
-		ws_url="ws://"+(window.location.origin.split("://")[1])+"/ws/"; //guess automatically -> now default behaviour
-	//}
+	// Determine the home URL based on the current location
+ 	ws_url = "ws://" + window.location.host + window.location.pathname + "ws/";
+ 	// We would like something like the following, but the URL() constructor doesn't
+ 	// do any useful URL normalisation.
+ 	//ws_url = new URL("ws/", "ws://" + window.location.host + window.location.pathname);
+
 	if (!("WebSocket" in window))
 		divlog("Your browser does not support WebSocket, which is required for WebRX to run. Please upgrade to a HTML5 compatible browser.");
 	ws = new WebSocket(ws_url+client_id);
diff --git a/openwebrx.py b/openwebrx.py
index 07c91e1de..91acd70e2 100755
--- a/openwebrx.py
+++ b/openwebrx.py
@@ -407,7 +407,7 @@ def proc_read_thread():
     def send_302(self,what):
         self.send_response(302)
         self.send_header('Content-type','text/html')
-        self.send_header("Location", "http://{0}:{1}/{2}".format(cfg.server_hostname,cfg.web_port,what))
+        self.send_header("Location", "http://{0}/{1}".format(cfg.server_url,what))
         self.end_headers()
         self.wfile.write("<html><body><h1>Object moved</h1>Please <a href=\"/{0}\">click here</a> to continue.</body></html>".format(what))
 
@@ -670,7 +670,7 @@ def do_GET(self):
                     replace_dictionary=(
                         ("%[RX_PHOTO_DESC]",cfg.photo_desc),
                         ("%[CLIENT_ID]", generate_client_id(self.client_address[0])) if "%[CLIENT_ID]" in data else "",
-                        ("%[WS_URL]","ws://"+cfg.server_hostname+":"+str(cfg.web_port)+"/ws/"),
+                        ("%[WS_URL]","ws://"+cfg.server_url+"/ws/"),
                         ("%[RX_TITLE]",cfg.receiver_name),
                         ("%[RX_LOC]",cfg.receiver_location),
                         ("%[RX_QRA]",cfg.receiver_qra),
diff --git a/sdrhu.py b/sdrhu.py
index d06ae058e..58498748d 100755
--- a/sdrhu.py
+++ b/sdrhu.py
@@ -26,7 +26,7 @@ def run(continuously=True):
     if not cfg.sdrhu_key: return 
     firsttime="(Your receiver is soon getting listed on sdr.hu!)"
     while True:
-        cmd = "wget --timeout=15 -4qO- https://sdr.hu/update --post-data \"url=http://"+cfg.server_hostname+":"+str(cfg.web_port)+"&apikey="+cfg.sdrhu_key+"\" 2>&1"
+        cmd = "wget --timeout=15 -4qO- https://sdr.hu/update --post-data \"url=http://"+cfg.server_url+"&apikey="+cfg.sdrhu_key+"\" 2>&1"
         print "[openwebrx-sdrhu]", cmd
         returned=subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).communicate()
         returned=returned[0]
