diff -u virt-goodies-0.4/vmware2libvirt virt-goodies-0.4/vmware2libvirt
--- virt-goodies-0.4/vmware2libvirt
+++ virt-goodies-0.4/vmware2libvirt
@@ -102,7 +102,7 @@
         raise V2LError("'uuidgen' exited with error: " + out)
     return out.strip()
 
-def get_disk(directory, vmx):
+def get_disk(dir, vmx):
     '''Detect the disk vmware image uses'''
     scsi_disk = ""
     ide_disk = ""
@@ -134,7 +134,7 @@
     else:
         raise V2LError("Couldn't find any disks")
 
-    disk = os.path.join(directory, disk)
+    disk = os.path.join(dir, disk)
     if not os.path.exists(disk):
         warn("'" + disk + "' does not exist")
 
@@ -227,9 +227,9 @@
 if opts.netmodel:
     netmodel = opts.netmodel
 
-directory = os.path.abspath(os.path.dirname(opts.vmxfile))
+dir = os.path.abspath(os.path.dirname(opts.vmxfile))
 try:
-    disk = get_disk(directory, vmx)
+    disk = get_disk(dir, vmx)
 except:
     error
 
diff -u virt-goodies-0.4/debian/changelog virt-goodies-0.4/debian/changelog
--- virt-goodies-0.4/debian/changelog
+++ virt-goodies-0.4/debian/changelog
@@ -1,9 +1,12 @@
-virt-goodies (0.4-1ubuntu1) natty; urgency=low
+virt-goodies (0.4-2) unstable; urgency=low
 
-  * vmware2libvirt: allow for ide0:0.filename (used by easyvmx). Patch based
-    on work by Ang Way Chuang.
+  * vmware2libvirt: allow for ide0:0.filename (used by easyvmx). Patch
+    based on work by Ang Way Chuang (Closes: #609039).  Patch from
+    Ubuntu and Jamie Strandboge.
+  * Add recommend on munin-libvirt-plugins (Closes: #611206).
+  * Update Standards-Version from 3.8.4 to 3.9.4.  No changes needed.
 
- -- Jamie Strandboge <jamie@ubuntu.com>  Wed, 05 Jan 2011 11:08:36 -0600
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 13 Jan 2013 18:23:01 +0100
 
 virt-goodies (0.4-1) unstable; urgency=low
 
diff -u virt-goodies-0.4/debian/control virt-goodies-0.4/debian/control
--- virt-goodies-0.4/debian/control
+++ virt-goodies-0.4/debian/control
@@ -1,10 +1,9 @@
 Source: virt-goodies
 Section: admin
 Priority: extra
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-XSBC-Original-Maintainer: Petter Reinholdtsen <pere@debian.org>
+Maintainer: Petter Reinholdtsen <pere@debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.4
 Homepage: http://launchpad.net/virt-goodies
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-virt/virt-goodies/trunk
 Vcs-Browser: http://codebrowse.launchpad.net/~ubuntu-virt/virt-goodies/trunk
@@ -12,7 +11,7 @@
 Package: virt-goodies
 Architecture: all
 Depends: ${misc:Depends}, python-libvirt, libvirt-bin, python, uuid-runtime
-Recommends: munin-node
+Recommends: munin-node, munin-libvirt-plugins
 Description: A collection of helpful virtualisation related tools
  Included tools are:
  .