6 files changed, 6 insertions, 6 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 37e373c789..8e9c8e77fd 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -32,5 +32,5 @@ clean:
 	$(MAKE) -C xentrace clean
 	$(MAKE) -C xenctl clean
 	$(MAKE) -C xend clean
-	$(MAKE) -C xenmgr install
+	$(MAKE) -C xenmgr clean
 
diff --git a/tools/xenmgr/lib/xm/__init__.py b/tools/xenmgr/lib/xm/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tools/xenmgr/lib/xm/__init__.py
diff --git a/tools/xenmgr/lib/xm/create.py b/tools/xenmgr/lib/xm/create.py
index e09f567311..e173a548dc 100644
--- a/tools/xenmgr/lib/xm/create.py
+++ b/tools/xenmgr/lib/xm/create.py
@@ -86,7 +86,7 @@ opts.opt('nics', val="N",
          use="Set the number of network interfaces.")
 
 opts.opt('vnet', val='VNET',
-         fn=set_append_value, default=[],
+         fn=append_value, default=[],
          use="""Define the vnets for the network interfaces.
          More than one vnet may be given, they are used in order.
          """)
@@ -227,7 +227,7 @@ def preprocess_ip(opts):
           + ':' + opts.gateway
           + ':' + opts.netmask
           + ':' + opts.hostname
-          + ':' : opts.interface
+          + ':' + opts.interface
           + ':' + opts.dhcp)
     opts.cmdline_ip = ip
 
diff --git a/tools/xenmgr/lib/xm/main.py b/tools/xenmgr/lib/xm/main.py
index 0bc56e699c..1810c8dde0 100644
--- a/tools/xenmgr/lib/xm/main.py
+++ b/tools/xenmgr/lib/xm/main.py
@@ -32,7 +32,7 @@ class Xm:
                 return 1
         return 0
 
-    def unknown(self, args):
+    def unknown(self, help, args):
         self.err("Unknown command: %s\nTry '%s help' for more information."
                  % (args[0], self.prog))
 
diff --git a/tools/xenmgr/lib/xm/shutdown.py b/tools/xenmgr/lib/xm/shutdown.py
index 21782f36d0..805af2929d 100644
--- a/tools/xenmgr/lib/xm/shutdown.py
+++ b/tools/xenmgr/lib/xm/shutdown.py
@@ -3,7 +3,7 @@ import sys
 import time
 
 from xenmgr.XendClient import server
-from xenmgr.xm import opts
+from xenmgr.xm.opts import *
 
 opts = Opts(use="""[options] [DOM]
 
diff --git a/tools/xenmgr/setup.py b/tools/xenmgr/setup.py
index b08cf29c31..b7f76139be 100644
--- a/tools/xenmgr/setup.py
+++ b/tools/xenmgr/setup.py
@@ -9,6 +9,6 @@ setup(name            = PACKAGE,
       description     = 'Xen Management API',
       author          = 'Mike Wray',
       author_email    = 'mike.wray@hp.com',
-      packages        = [ PACKAGE, PACKAGE + '.server' ],
+      packages        = [ PACKAGE, PACKAGE + '.server', PACKAGE + '.xm' ],
       package_dir     = { PACKAGE: 'lib' },
       )