diff --git a/misc/xen-tools b/misc/xen-tools
index d10d3f6..5864dbb 100644
--- a/misc/xen-tools
+++ b/misc/xen-tools
@@ -20,7 +20,7 @@
 # --
 # http://www.steve.org.uk
 #
-# $Id: xen-tools,v 1.13 2005-12-27 16:01:58 steve Exp $
+# $Id: xen-tools,v 1.14 2005-12-27 16:05:55 steve Exp $
 #
 
 
@@ -31,9 +31,9 @@
 #  Completes the command line flags, and will allow tab completion of
 # the supported filesystems
 #
-_xen-create-image()
+_xen_create_image()
 {
-    local cur prev i exprfound onlyonce
+    local cur prev ip
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
@@ -70,7 +70,7 @@ _xen-create-image()
         return 0
     fi
 }
-complete -F _xen-create-image $filenames xen-create-image
+complete -F _xen-create-image xen_create_image
 
 
 
@@ -80,7 +80,7 @@ complete -F _xen-create-image $filenames xen-create-image
 #
 _xen_duplicate_image() 
 {
-    local cur prev opts base
+    local cur prev opts base ip
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"