--- 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	2006-10-29 09:42:23.000000000 -0600
+++ src/Config.h	2007-03-03 15:17:36.000000000 -0600
@@ -36,10 +36,10 @@ const wxString DEF_JPEG2MPEG_CMD = _T("j
   const wxString DEF_PREVIEW_CMD   = _T("");
   const bool DEF_GENERATE_DO       = false;
   const bool DEF_ISO_DO            = true;
-  const wxString DEF_ISO_CMD       = _T("mkisofs  -V '$VOL_ID' -o '$FILE' -dvd-video '$DIR'");
-  const wxString DEF_ISO_SIZE_CMD  = _T("mkisofs -q -print-size '$DIR'");
+  const wxString DEF_ISO_CMD       = _T("genisoimage  -V '$VOL_ID' -o '$FILE' -dvd-video '$DIR'");
+  const wxString DEF_ISO_SIZE_CMD  = _T("genisoimage -q -print-size '$DIR'");
   const bool DEF_BURN_DO           = false;
-  const wxString DEF_BURN_CMD      = _T(""); // _T("mkisofs -dvd-video '$DIR' | cdrecord dev=$DEV -v driveropts=burnfree fs=64m -dao tsize=$SIZEs -");
+  const wxString DEF_BURN_CMD      = _T(""); // _T("genisoimage -dvd-video '$DIR' | cdrecord dev=$DEV -v driveropts=burnfree fs=64m -dao tsize=$SIZEs -");
   const wxString DEF_BURN_DEVICE   = _T(""); // _T("1,0,0");
   const wxString DEF_BURN_SCAN_CMD = _T(""); // _T("cdrecord -scanbus");
   const wxString DEF_BURN_SPEED_OPT= _T(""); // _T("speed=$SPEED");
@@ -54,8 +54,8 @@ const wxString DEF_JPEG2MPEG_CMD = _T("j
   const wxString DEF_PREVIEW_CMD   = _T("xine \"dvd:/$DIR\"");
   const bool DEF_GENERATE_DO       = false;
   const bool DEF_ISO_DO            = false;
-  const wxString DEF_ISO_CMD       = _T("mkisofs  -V \"$VOL_ID\" -o \"$FILE\" -dvd-video \"$DIR\"");
-  const wxString DEF_ISO_SIZE_CMD  = _T("mkisofs -q -print-size \"$DIR\"");
+  const wxString DEF_ISO_CMD       = _T("genisoimage  -V \"$VOL_ID\" -o \"$FILE\" -dvd-video \"$DIR\"");
+  const wxString DEF_ISO_SIZE_CMD  = _T("genisoimage -q -print-size \"$DIR\"");
   const bool DEF_BURN_DO           = true;
   const wxString DEF_BURN_CMD      = _T("growisofs  -V \"$VOL_ID\" -dvd-compat -Z $DEV -dvd-video \"$DIR\" $SPEEDSTR");
   const wxString DEF_BURN_DEVICE   = _T("/dev/dvd");