diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
index 55e793ed..26c8bdff 100644
--- a/src/pypungi/__init__.py
+++ b/src/pypungi/__init__.py
@@ -1041,7 +1041,7 @@ cost=500
 
         # setup the base command
         mkisofs = ['/usr/bin/mkisofs']
-        mkisofs.extend(['-v', '-U', '-J', '-R', '-T', '-m', 'repoview', '-m', 'images/boot.iso']) # common mkisofs flags
+        mkisofs.extend(['-v', '-U', '-J', '-R', '-T', '-m', 'repoview', '-m', 'boot.iso']) # common mkisofs flags
 
         x86bootargs = ['-b', 'isolinux/isolinux.bin', '-c', 'isolinux/boot.cat', 
             '-no-emul-boot', '-boot-load-size', '4', '-boot-info-table']
diff --git a/src/pypungi/splittree.py b/src/pypungi/splittree.py
index 65564765..06d67924 100644
--- a/src/pypungi/splittree.py
+++ b/src/pypungi/splittree.py
@@ -249,7 +249,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
 
         # Set the bin_list to 1 to start with.  We'll add more as needed.
         self.bin_list = [1]
-        p = os.popen('find %s/ -type f -not -name .discinfo -not -name "*\.rpm" -not -name "boot.iso"' % self.dist_dir, 'r')
+        p = os.popen('find %s/ -type f -not -name .discinfo -not -name "*\.rpm" -not -name "*boot.iso"' % self.dist_dir, 'r')
         filelist = p.read()
         p.close()
         filelist = string.split(filelist)