diff --git a/include/cdio/cdio.h b/include/cdio/cdio.h
index fa65379d..e1116390 100644
--- a/include/cdio/cdio.h
+++ b/include/cdio/cdio.h
@@ -1,5 +1,5 @@
 /* -*- c -*-
-    $Id: cdio.h,v 1.30 2003/10/03 07:54:59 rocky Exp $
+    $Id: cdio.h,v 1.31 2003/10/04 23:11:50 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -403,6 +403,8 @@ extern "C" {
 
   char * cdio_get_default_device_osx(void);
   
+  char **cdio_get_devices_osx(void);
+  
   /*! Win32 CD-reading routines. 
      NULL is returned on error.
    */
diff --git a/lib/cdio.c b/lib/cdio.c
index 17d8a248..8b64be11 100644
--- a/lib/cdio.c
+++ b/lib/cdio.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cdio.c,v 1.35 2003/10/04 21:28:27 rocky Exp $
+    $Id: cdio.c,v 1.36 2003/10/04 23:12:22 rocky Exp $
 
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -37,7 +37,7 @@
 #include <cdio/logging.h>
 #include "cdio_private.h"
 
-static const char _rcsid[] = "$Id: cdio.c,v 1.35 2003/10/04 21:28:27 rocky Exp $";
+static const char _rcsid[] = "$Id: cdio.c,v 1.36 2003/10/04 23:12:22 rocky Exp $";
 
 
 const char *track_format2str[6] = 
@@ -132,7 +132,7 @@ CdIo_driver_t CdIo_all_drivers[CDIO_MAX_DRIVER+1] = {
    &cdio_open_osx,
    &cdio_get_default_device_osx,
    &cdio_is_device_generic,
-   NULL
+   &cdio_get_devices_osx
   },
 
   {DRIVER_WIN32, 
@@ -143,7 +143,7 @@ CdIo_driver_t CdIo_all_drivers[CDIO_MAX_DRIVER+1] = {
    &cdio_open_win32,
    &cdio_get_default_device_win32,
    &cdio_is_device_win32,
-   NULL
+   &cdio_get_devices_win32
   },
 
   {DRIVER_BINCUE,