diff --git a/gqrx-panadapter.py b/gqrx-panadapter.py
index f3266a8..19e0935 100755
--- a/gqrx-panadapter.py
+++ b/gqrx-panadapter.py
@@ -25,9 +25,13 @@ import time
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('-g', '--gqrx-port', type=int, default=7356,
+    parser.add_argument('-ga', '--gqrx-address', type=str, default='localhost',
+            metavar='A', help='address that Gqrx is listening on')
+    parser.add_argument('-gp', '--gqrx-port', type=int, default=7356,
             metavar='P', help='remote control port configured in Gqrx')
-    parser.add_argument('-r', '--rigctld-port', type=int, default=4532,
+    parser.add_argument('-ra', '--rigctld-address', type=str, default='localhost',
+            metavar='A', help='address that rigctld is listening on')
+    parser.add_argument('-rp', '--rigctld-port', type=int, default=4532,
             metavar='P', help='listening port of rigctld')
     parser.add_argument('-i', '--interval', type=int, default=1000,
             metavar='T', help='update interval in milliseconds')
@@ -38,14 +42,14 @@ def main():
 
     try:
         rs = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        rs.connect(('127.0.0.1', args.rigctld_port))
+        rs.connect((args.rigctld_address, args.rigctld_port))
     except Exception as e:
         print('Connection to rigctld failed:', e, file=sys.stderr)
         return 1
 
     try:
         gs = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        gs.connect(('127.0.0.1', args.gqrx_port))
+        gs.connect((args.gqrx_address, args.gqrx_port))
     except Exception as e:
         print('Connection to Gqrx failed:', e, file=sys.stderr)
         return 1