diff --git a/configure.ac b/configure.ac
index d3e86fb6..7c1d926b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,7 +324,7 @@ case $host_os in
        ## AC_DEFINE([HAVE_AIX_CDROM], [1],
        ##     [Define 1 if you have AIX CD-ROM support])
        ;;
-     darwin6*|darwin7*|darwin8*|darwin9*)
+     darwin6*|darwin7*|darwin8*|darwin9*|darwin10*)
        AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, 
                         [have_iokit_h="yes"])
        if test "x$have_iokit_h" = "xyes" ; then 
@@ -345,6 +345,16 @@ case $host_os in
 	     DARWIN_PKG_LIB_HACK="$DARWIN_PKG_LIB_HACK -Wl,-framework,DiskArbitration"
 	 fi
 
+	 case $host_os in
+	   darwin10*)
+	   	darwin_10=1
+		;;
+	   *)
+	   	darwin_10=0
+		;;
+	 esac
+         AC_DEFINE([DARWIN_10_OR_GREATER], [$darwin_10],
+	      [Define 1 if you have Darwin OS X 10 or greater])
 	 AC_SUBST(DARWIN_PKG_LIB_HACK)
 	 LIBCDIO_LIBS="$LIBCDIO_LIBS $DARWIN_PKG_LIB_HACK"
          cd_drivers="${cd_drivers}, Darwin"
diff --git a/lib/driver/osx.c b/lib/driver/osx.c
index c3c058b3..167aa112 100644
--- a/lib/driver/osx.c
+++ b/lib/driver/osx.c
@@ -69,7 +69,11 @@ typedef enum {
 
 #include <mach/mach.h>
 #include <Carbon/Carbon.h>
-#include <IOKit/scsi-commands/SCSITaskLib.h>
+#ifdef DARWIN_10_OR_GREATER
+# include <IOKit/scsi/SCSITaskLib.h>
+#else
+# include <IOKit/scsi-commands/SCSITaskLib.h>
+#endif
 #include <IOKit/IOCFPlugIn.h>
 #include <mach/mach_error.h>
 
@@ -83,12 +87,15 @@ typedef enum {
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-
 #include <paths.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOBSD.h>
-#include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>
+#ifdef DARWIN_10_OR_GREATER
+# include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
+#else
+# include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>
+#endif
 #include <IOKit/storage/IOCDTypes.h>
 #include <IOKit/storage/IODVDTypes.h>
 #include <IOKit/storage/IOMedia.h>