--- configure.in.orig	2007-02-22 12:34:46.000000000 -0600
+++ configure.in	2007-03-03 15:38:51.000000000 -0600
@@ -122,11 +122,11 @@ if test "x$MPGTX_PATH" = x; then
     Please check that mpgtx is in path.
 ])
 fi
-AC_PATH_PROG(MKISOFS_PATH, mkisofs)
+AC_PATH_PROG(MKISOFS_PATH, genisoimage)
 if test "x$MKISOFS_PATH" = x; then
   AC_MSG_ERROR([
-    DVDStyler requires mkisofs (cdrtools).
-    Please check that mkisofs is in path.
+    DVDStyler requires genisoimage (cdrkit).
+    Please check that genisoimage is in path.
 ])
 fi
 AC_PATH_PROG(GROWISOFS_PATH, growisofs)
--- src/Config.h.orig	2007-06-10 21:28:31.000000000 +0800
+++ src/Config.h	2007-08-28 00:33:27.000000000 +0800
@@ -34,7 +34,7 @@
   const wxString DEF_DVDAUTHOR_CMD = _T("dvdauthor -o '$DIR' -x '$FILE_CONF'");
   const bool DEF_PREVIEW_DO        = false;
   const wxString DEF_PREVIEW_CMD   = _T("");
-  const wxString DEF_ISO_CMD       = _T("mkisofs  -V '$VOL_ID' -o '$FILE' -dvd-video '$DIR'");
+  const wxString DEF_ISO_CMD       = _T("genisoimage -V '$VOL_ID' -o '$FILE' -dvd-video '$DIR'");
   const wxString DEF_BURN_CMD      = _T("growisofs  -V '$VOL_ID' -dvd-compat -Z $DEV -dvd-video '$DIR' $SPEEDSTR");
   const wxString DEF_BURN_ISO_CMD  = _T("growisofs -dvd-compat -Z $DEV='$FILE' -use-the-force-luke=dao:$SIZE $SPEEDSTR");
   const wxString DEF_BURN_DEVICE   = _T("");
@@ -45,7 +45,7 @@
   const wxString DEF_DVDAUTHOR_CMD = _T("dvdauthor -o \"$DIR\" -x \"$FILE_CONF\"");
   const bool DEF_PREVIEW_DO        = true;
   const wxString DEF_PREVIEW_CMD   = _T("xine \"dvd:/$DIR\"");
-  const wxString DEF_ISO_CMD       = _T("mkisofs -V \"$VOL_ID\" -o \"$FILE\" -dvd-video \"$DIR\"");
+  const wxString DEF_ISO_CMD       = _T("genisoimage -V \"$VOL_ID\" -o \"$FILE\" -dvd-video \"$DIR\"");
   const wxString DEF_BURN_CMD      = _T("growisofs -V \"$VOL_ID\" -dvd-compat -Z $DEV -dvd-video \"$DIR\" $SPEEDSTR");
   const wxString DEF_BURN_ISO_CMD  = _T("growisofs -dvd-compat -Z $DEV=\"$FILE\" -use-the-force-luke=dao:$SIZE $SPEEDSTR");
   const wxString DEF_BURN_DEVICE   = _T("/dev/dvd");