--- a/si	Wed Jan 20 21:42:28 2010 +0100
+++ b/si	Wed Jan 20 21:52:01 2010 +0100
@@ -11,9 +11,10 @@
 use IO::File;
 use Sys::Hostname;
 use Getopt::Long;
-use File::Path qw(make_path remove_tree);
+use File::Path;
 use File::Basename;
 
+use lib "lib";
 use SI::ptable;
 use SI::blkid;
 use SI::lvm;
@@ -44,10 +45,11 @@
     }
     else {
         $dir = dirname($0) . "/../image-$id{mac}";
-        remove_tree($dir);
+        rmtree($dir);
         -d $dir or mkdir($dir, 0700) or die "Can't mkdir $dir: $!\n";
     }
-    make_path(map { "$dir/$_" } qw(info ptable lvm blkid mbr dump));
+
+    mkpath(map { "$dir/$_" } qw(info ptable lvm blkid mbr dump));
 
     SI::ptable::volumes("$dir/ptable/%s", %devices);
     die Dumper \%devices if $opt_exit =~ /ptable/;