diff --git a/configure.ac b/configure.ac
index 16cea3d8..60d8a1fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 69)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.79 2004/05/09 17:03:27 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.80 2004/05/31 15:21:48 thesin Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 AM_INIT_AUTOMAKE
@@ -230,13 +230,13 @@ AC_SUBST(LIBCDIO_LIBS)
 AC_SUBST(LIBISO9660_LIBS)
 
 case $host_os in
-     darwin6*)
+     darwin6*|darwin7*)
        AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, 
                         [have_iokit_h="yes"])
        if test "x$have_iokit_h" = "xyes" ; then 
          AC_DEFINE([HAVE_DARWIN_CDROM], [1],
 	      [Define 1 if you have Darwin OS X-type CD-ROM support])
-	 LIBS="$LIBS  -framework CoreFoundation -framework IOKit"
+	 LIBS="$LIBS  -Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,IOKit"
          cd_drivers="${cd_drivers}, Darwin"
        fi
      ;;
diff --git a/lib/_cdio_osx.c b/lib/_cdio_osx.c
index 3ee1f531..372ab6e5 100644
--- a/lib/_cdio_osx.c
+++ b/lib/_cdio_osx.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_osx.c,v 1.23 2004/05/27 10:47:07 rocky Exp $
+    $Id: _cdio_osx.c,v 1.24 2004/05/31 15:21:48 thesin Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> 
     from vcdimager code: 
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.23 2004/05/27 10:47:07 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.24 2004/05/31 15:21:48 thesin Exp $";
 
 #include <cdio/sector.h>
 #include <cdio/util.h>
@@ -705,7 +705,7 @@ cdio_get_devices_osx(void)
       return( nil );
     }
   
-  CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectable),
+  CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey),
 			kCFBooleanTrue );
   
   kern_result = IOServiceGetMatchingServices( master_port, 
@@ -726,7 +726,7 @@ cdio_get_devices_osx(void)
       do
 	{
 	  str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
-							  CFSTR( kIOBSDName ),
+							  CFSTR( kIOBSDNameKey ),
 							  kCFAllocatorDefault,
 							  0 );
 	  if( str_bsd_path == NULL )
@@ -787,7 +787,7 @@ cdio_get_default_device_osx(void)
       return( nil );
     }
   
-  CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectable),
+  CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey),
 			kCFBooleanTrue );
   
   kern_result = IOServiceGetMatchingServices( master_port, 
@@ -808,7 +808,7 @@ cdio_get_default_device_osx(void)
       do
 	{
 	  str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
-							  CFSTR( kIOBSDName ),
+							  CFSTR( kIOBSDNameKey ),
 							  kCFAllocatorDefault,
 							  0 );
 	  if( str_bsd_path == NULL )