diff --git a/pandora_client/__init__.py b/pandora_client/__init__.py
index e021b4e..5ab092e 100755
--- a/pandora_client/__init__.py
+++ b/pandora_client/__init__.py
@@ -943,14 +943,14 @@ class Client(object):
             sys.exit(1)
 
     def server(self, args):
-        import server
+        from . import server
         server.run(self, args)
 
     def client(self, args):
         if not args:
             print('usage: %s client <server_url>\n\ti.e. %s client http://192.168.1.1:8789' % (sys.argv[0], sys.argv[0]))
             sys.exit(1)
-        import client
+        from . import client
         url = args[0]
         if len(args) == 1:
             name = socket.gethostname()