diff --git a/lib/FreeBSD/freebsd_cam.c b/lib/FreeBSD/freebsd_cam.c
index 993228f4..c7d4aa90 100644
--- a/lib/FreeBSD/freebsd_cam.c
+++ b/lib/FreeBSD/freebsd_cam.c
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd_cam.c,v 1.15 2004/07/08 01:28:00 rocky Exp $
+    $Id: freebsd_cam.c,v 1.16 2004/07/08 05:19:29 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.15 2004/07/08 01:28:00 rocky Exp $";
+static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.16 2004/07/08 05:19:29 rocky Exp $";
 
 #ifdef HAVE_FREEBSD_CDROM
 
@@ -186,7 +186,7 @@ get_drive_cap_freebsd_cam (img_private_t *env)
 		 sizeof(env->ccb.csio.sense_data), 0, 30*1000);
 
   /* Initialize my_scsi_cdb as a Mode Select(6) */
-  CDIO_MMC_SET_COMMAND(env->ccb.csio.cdb_io.cdb_bytes, CDIO_MMC_MODE_SENSE);
+  CDIO_MMC_SET_COMMAND(env->ccb.csio.cdb_io.cdb_bytes, CDIO_MMC_GPCMD_MODE_SENSE);
   env->ccb.csio.cdb_io.cdb_bytes[1] = 0x0;  
                                       /* use ALL_PAGES?*/
   env->ccb.csio.cdb_io.cdb_bytes[2] = CDIO_MMC_CAPABILITIES_PAGE; 
diff --git a/lib/_cdio_sunos.c b/lib/_cdio_sunos.c
index 12b55b07..4e6b8212 100644
--- a/lib/_cdio_sunos.c
+++ b/lib/_cdio_sunos.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_sunos.c,v 1.42 2004/06/27 21:57:45 rocky Exp $
+    $Id: _cdio_sunos.c,v 1.43 2004/07/08 05:19:27 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -38,7 +38,7 @@
 
 #ifdef HAVE_SOLARIS_CDROM
 
-static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.42 2004/06/27 21:57:45 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.43 2004/07/08 05:19:27 rocky Exp $";
 
 #ifdef HAVE_GLOB_H
 #include <glob.h>
@@ -517,7 +517,7 @@ _cdio_get_drive_cap_solaris (const void *user_data)
   memset(&my_rq_buf,   0, sizeof(my_rq_buf));
   
   /* Initialize my_scsi_cdb as a Mode Select(6) */
-  CDIO_MMC_SET_COMMAND(my_scsi_cdb, CDIO_MMC_MODE_SENSE);
+  CDIO_MMC_SET_COMMAND(my_scsi_cdb, CDIO_MMC_GPCMD_MODE_SENSE);
   my_scsi_cdb[1] = 0x0;  
   my_scsi_cdb[2] = CDIO_MMC_CAPABILITIES_PAGE; 
   my_scsi_cdb[3] = 0;    /* Not used */