diff --git a/middleware/qira.py b/middleware/qira.py
index 43bede9e..f10ad61e 100755
--- a/middleware/qira.py
+++ b/middleware/qira.py
@@ -25,7 +25,7 @@ if __name__ == '__main__':
   parser.add_argument("--dwarf", help="parse program dwarf data", action="store_true")
   parser.add_argument("--cda", help="use CDA to view source, requires ./cda_build.sh", action="store_true")
   parser.add_argument("--pin", help="use pin as the backend, requires ./pin_build.sh", action="store_true")
-  parser.add_argument("--web-host", metavar="HOST", help="listen address for web interface. 127.0.0.1 by default", default=qira_config.WEB_HOST)
+  parser.add_argument("--host", metavar="HOST", help="listen address for web interface and socat. 127.0.0.1 by default", default=qira_config.HOST)
   parser.add_argument("--web-port", metavar="PORT", help="listen port for web interface. 3002 by default", type=int, default=qira_config.WEB_PORT)
   parser.add_argument("--socat-port", metavar="PORT", help="listen port for socat. 4000 by default", type=int, default=qira_config.SOCAT_PORT)
 
@@ -44,7 +44,7 @@ if __name__ == '__main__':
   if args.socat_port < 1 or args.socat_port > 65535:
     raise Exception("--socat-port must be a valid port number (1-65535)")
   try:
-    args.web_host = ipaddr.IPAddress(args.web_host).exploded
+    args.host = ipaddr.IPAddress(args.host).exploded
   except ValueError:
     raise Exception("--web-host must be a valid IPv4/IPv6 address")
 
@@ -54,7 +54,7 @@ if __name__ == '__main__':
     args.cda = True
     qira_config.CALLED_AS_CDA = True
 
-  qira_config.WEB_HOST = args.web_host
+  qira_config.HOST = args.host
   qira_config.WEB_PORT = args.web_port
   qira_config.SOCAT_PORT = args.socat_port
   qira_config.FORK_PORT = args.socat_port + 1
diff --git a/middleware/qira_config.py b/middleware/qira_config.py
index 58d1cda3..604a942e 100644
--- a/middleware/qira_config.py
+++ b/middleware/qira_config.py
@@ -3,7 +3,7 @@ import os
 WITH_CDA = False
 WITH_DWARF = False
 TRACE_LIBRARIES = False
-WEB_HOST = '127.0.0.1'
+HOST = '127.0.0.1'
 WEB_PORT = 3002
 SOCAT_PORT = 4000
 FORK_PORT = SOCAT_PORT + 1
diff --git a/middleware/qira_socat.py b/middleware/qira_socat.py
index 43669739..edcbd69d 100644
--- a/middleware/qira_socat.py
+++ b/middleware/qira_socat.py
@@ -17,7 +17,7 @@ def start_bindserver(program, port, parent_id, start_cl, loop = False):
   if port not in bound_ports:
     myss = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     myss.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    myss.bind(("127.0.0.1", port))
+    myss.bind((qira_config.HOST, port))
     myss.listen(5)
     bound_ports[port] = myss
   else:
diff --git a/middleware/qira_webserver.py b/middleware/qira_webserver.py
index 81bfa7d0..9588d41a 100644
--- a/middleware/qira_webserver.py
+++ b/middleware/qira_webserver.py
@@ -404,8 +404,8 @@ def run_server(largs, lprogram):
     import cacheserver
     app.register_blueprint(cacheserver.app)
     cacheserver.set_cache(program.cda)
-  print "****** starting WEB SERVER on %s:%d" % (qira_config.WEB_HOST, qira_config.WEB_PORT)
+  print "****** starting WEB SERVER on %s:%d" % (qira_config.HOST, qira_config.WEB_PORT)
   threading.Thread(target=mwpoller).start()
-  socketio.run(app, host=qira_config.WEB_HOST, port=qira_config.WEB_PORT)
+  socketio.run(app, host=qira_config.HOST, port=qira_config.WEB_PORT)