diff --git a/lib/driver/FreeBSD/freebsd.c b/lib/driver/FreeBSD/freebsd.c
index ad9178da..601b8fc0 100644
--- a/lib/driver/FreeBSD/freebsd.c
+++ b/lib/driver/FreeBSD/freebsd.c
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd.c,v 1.34 2006/03/02 20:48:34 flameeyes Exp $
+    $Id: freebsd.c,v 1.35 2006/03/03 09:50:30 flameeyes Exp $
 
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: freebsd.c,v 1.34 2006/03/02 20:48:34 flameeyes Exp $";
+static const char _rcsid[] = "$Id: freebsd.c,v 1.35 2006/03/03 09:50:30 flameeyes Exp $";
 
 #include "freebsd.h"
 
@@ -511,8 +511,8 @@ get_drive_cap_freebsd (const void *p_user_data,
  */
 static driver_return_code_t
 run_mmc_cmd_freebsd( void *p_user_data, unsigned int i_timeout_ms,
-		     unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb, 
-		     scsi_mmc_direction_t e_direction, 
+		     unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
+		     cdio_mmc_direction_t e_direction, 
 		     unsigned int i_buf, /*in/out*/ void *p_buf ) 
 {
   const _img_private_t *p_env = p_user_data;
diff --git a/lib/driver/FreeBSD/freebsd.h b/lib/driver/FreeBSD/freebsd.h
index 94805e19..f64a59d2 100644
--- a/lib/driver/FreeBSD/freebsd.h
+++ b/lib/driver/FreeBSD/freebsd.h
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd.h,v 1.4 2005/07/23 22:24:04 rocky Exp $
+    $Id: freebsd.h,v 1.5 2006/03/03 09:50:30 flameeyes Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -215,8 +215,8 @@ bool read_toc_freebsd_ioctl (_img_private_t *env);
 int run_mmc_cmd_freebsd_cam( const void *p_user_data, 
 			     unsigned int i_timeout_ms,
 			     unsigned int i_cdb, 
-			     const scsi_mmc_cdb_t *p_cdb, 
-			     scsi_mmc_direction_t e_direction, 
+			     const mmc_cdb_t *p_cdb, 
+			     cdio_mmc_direction_t e_direction, 
 			     unsigned int i_buf, 
 			     /*in/out*/ void *p_buf );
 
diff --git a/lib/driver/FreeBSD/freebsd_cam.c b/lib/driver/FreeBSD/freebsd_cam.c
index a066648c..a71a12c0 100644
--- a/lib/driver/FreeBSD/freebsd_cam.c
+++ b/lib/driver/FreeBSD/freebsd_cam.c
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd_cam.c,v 1.10 2005/07/23 22:24:04 rocky Exp $
+    $Id: freebsd_cam.c,v 1.11 2006/03/03 09:50:30 flameeyes Exp $
 
     Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.10 2005/07/23 22:24:04 rocky Exp $";
+static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.11 2006/03/03 09:50:30 flameeyes Exp $";
 
 #ifdef HAVE_FREEBSD_CDROM
 
@@ -54,8 +54,8 @@ static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.10 2005/07/23 22:24:04 rock
  */
 int
 run_mmc_cmd_freebsd_cam( const void *p_user_data, unsigned int i_timeout_ms,
-			 unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb, 
-			 scsi_mmc_direction_t e_direction, 
+			 unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
+			 cdio_mmc_direction_t e_direction, 
 			 unsigned int i_buf, /*in/out*/ void *p_buf )
 {
   const _img_private_t *p_env = p_user_data;
@@ -181,7 +181,7 @@ int
 read_mode2_sectors_freebsd_cam (_img_private_t *p_env, void *p_buf, 
 				lsn_t lsn, unsigned int nblocks)
 {
-  scsi_mmc_cdb_t cdb = {{0, }};
+  mmc_cdb_t cdb = {{0, }};
 
   bool b_read_10 = false;
 
@@ -229,7 +229,7 @@ driver_return_code_t
 eject_media_freebsd_cam (_img_private_t *p_env) 
 {
   int i_status;
-  scsi_mmc_cdb_t cdb = {{0, }};
+  mmc_cdb_t cdb = {{0, }};
   uint8_t buf[1];
   
   CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL);