diff --git a/pandora_client/__init__.py b/pandora_client/__init__.py
index 231631b..3c178c4 100755
--- a/pandora_client/__init__.py
+++ b/pandora_client/__init__.py
@@ -926,7 +926,7 @@ class Client(object):
 
     def server(self, args):
         import server
-        server.run(self)
+        server.run(self, args)
 
     def client(self, args):
         if not args:
diff --git a/pandora_client/server.py b/pandora_client/server.py
index c61f3dd..c938914 100644
--- a/pandora_client/server.py
+++ b/pandora_client/server.py
@@ -184,11 +184,18 @@ class Server(Resource):
         self.client.sync([])
         self.client.update_encodes(True)
 
-def run(client):
+def run(client, args=None):
+    if not args: args = []
     root = Server(client)
     site = Site(root)
     port = 8789
     interface = '0.0.0.0'
+    if args:
+        if ':' in args[0]:
+            interface, port = args[0].split(':')
+            port = int(port)
+        else:
+            port = int(args[0])
     reactor.listenTCP(port, site, interface=interface)
     print 'listening on http://%s:%s' % (interface, port)
     client.update_encodes()