diff --git a/example/sample8.c b/example/sample8.c
index fbc19d6e..5de152eb 100644
--- a/example/sample8.c
+++ b/example/sample8.c
@@ -1,5 +1,5 @@
 /*
-  $Id: sample8.c,v 1.7 2004/07/24 06:11:30 rocky Exp $
+  $Id: sample8.c,v 1.8 2004/07/25 03:17:47 rocky Exp $
 
   Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
   
@@ -69,8 +69,26 @@ print_disc_info(CdIo *cdio, track_t i_tracks, track_t i_first_track) {
   case CDIO_DISC_MODE_CD_MIXED: 
     printf("Disc is mixed-mode.\n");
     break;
-  case CDIO_DISC_MODE_DVD: 
-    printf("Disc is some sort of DVD.\n");
+  case CDIO_DISC_MODE_DVD_ROM:
+    printf("DVD-ROM\n");
+    break;
+  case CDIO_DISC_MODE_DVD_RAM:
+    printf("DVD-RAM\n");
+    break;
+  case CDIO_DISC_MODE_DVD_R:
+    printf("DVD-R\n");
+    break;
+  case CDIO_DISC_MODE_DVD_RW:
+    printf("DVD-RW\n");
+    break;
+  case CDIO_DISC_MODE_DVD_PR:
+    printf("DVD+R\n");
+    break;
+  case CDIO_DISC_MODE_DVD_PRW:
+    printf("DVD+RW\n");
+    break;
+  case CDIO_DISC_MODE_DVD_OTHER:
+    printf("Unknown/unclassified DVD\n");
     break;
   case CDIO_DISC_MODE_NO_INFO: 
     printf("Don't now what disc is. Perhaps driver doesn't implement.\n");
diff --git a/include/cdio/scsi_mmc.h b/include/cdio/scsi_mmc.h
index 3e26a52f..6ea7be83 100644
--- a/include/cdio/scsi_mmc.h
+++ b/include/cdio/scsi_mmc.h
@@ -1,5 +1,5 @@
 /*
-    $Id: scsi_mmc.h,v 1.13 2004/07/23 11:29:49 rocky Exp $
+    $Id: scsi_mmc.h,v 1.14 2004/07/25 03:17:47 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -60,6 +60,7 @@
 #define CDIO_MMC_GPCMD_PLAY_AUDIO_12	     0xa5
 #define CDIO_MMC_GPCMD_READ_12	             0xa8
 #define CDIO_MMC_GPCMD_PLAY_TRACK_REL_12     0xa9
+#define CDIO_MMC_CPCMD_READ_DVD_STRUCTURE    0xad
 #define CDIO_MMC_GPCMD_READ_CD	             0xbe
 #define CDIO_MMC_GPCMD_READ_MSF	             0xb9
 
diff --git a/include/cdio/sector.h b/include/cdio/sector.h
index 975bcceb..a31ec480 100644
--- a/include/cdio/sector.h
+++ b/include/cdio/sector.h
@@ -1,5 +1,5 @@
 /*
-    $Id: sector.h,v 1.24 2004/07/25 03:05:18 rocky Exp $
+    $Id: sector.h,v 1.25 2004/07/25 03:17:47 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -102,22 +102,22 @@ typedef enum {
         CDIO_DISC_MODE_ERROR
 } discmode_t;
 
-#define CDIO_DISC_MODE_DVD                       \
-      (CDIO_DISC_MODE_DVD_ROM                    \
-       | CDIO_DISC_MODE_DVD_RAM                  \
-       | CDIO_DISC_MODE_DVD_R                    \
-       | CDIO_DISC_MODE_DVD_RW                   \
-       | CDIO_DISC_MODE_DVD_PR                   \
-       | CDIO_DISC_MODE_DVD_PRW                  \
-       | CDIO_DISC_MODE_DVD_OTHER)               
+#define CDIO_DISC_MODE_DVD                        \
+      (CDIO_DISC_MODE_DVD_ROM                     \
+       || CDIO_DISC_MODE_DVD_RAM                  \
+       || CDIO_DISC_MODE_DVD_R                    \
+       || CDIO_DISC_MODE_DVD_RW                   \
+       || CDIO_DISC_MODE_DVD_PR                   \
+       || CDIO_DISC_MODE_DVD_PRW                  \
+       || CDIO_DISC_MODE_DVD_OTHER)               
 
-#define CDIO_DISC_MODE_CD                        \
-      (CDIO_DISC_MODE_CD_DA                      \
-       | CDIO_DISC_MODE_CD_DATA_1                \
-       | CDIO_DISC_MODE_CD_DATA_2                \
-       | CDIO_DISC_MODE_CD_XA_2_1                \
-       | CDIO_DISC_MODE_CD_XA_2_2                \
-       | CDIO_DISC_MODE_CD_MIXED)                
+#define CDIO_DISC_MODE_CD                         \
+      (CDIO_DISC_MODE_CD_DA                       \
+       || CDIO_DISC_MODE_CD_DATA_1                \
+       || CDIO_DISC_MODE_CD_DATA_2                \
+       || CDIO_DISC_MODE_CD_XA_2_1                \
+       || CDIO_DISC_MODE_CD_XA_2_2                \
+       || CDIO_DISC_MODE_CD_MIXED)                
 
 /*! Information that can be obtained through a Read Subchannel
     command.