diff --git a/src/cd-info.c b/src/cd-info.c
index 985625a0..85063e4e 100644
--- a/src/cd-info.c
+++ b/src/cd-info.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cd-info.c,v 1.80 2004/07/31 07:43:26 rocky Exp $
+    $Id: cd-info.c,v 1.81 2004/08/06 00:53:58 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 1996, 1997, 1998  Gerd Knorr <kraxel@bytesex.org>
@@ -1022,9 +1022,10 @@ main(int argc, const char *argv[])
   printf(STRONG "\n");
   
 
+  discmode = cdio_get_discmode(p_cdio);
   if ( 0 == opts.no_disc_mode ) {
     printf("Disc mode is listed as: %s\n", 
-	   discmode2str[cdio_get_discmode(p_cdio)]);
+	   discmode2str[discmode]);
   }
   
   i_first_track = cdio_get_first_track_num(p_cdio);
diff --git a/src/util.c b/src/util.c
index 0abbf257..0da47778 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,5 +1,5 @@
 /*
-  $Id: util.c,v 1.11 2004/07/18 03:35:07 rocky Exp $
+  $Id: util.c,v 1.12 2004/08/06 00:53:59 rocky Exp $
 
   Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -137,10 +137,14 @@ void print_drive_capabilities(cdio_drive_read_cap_t  i_read_cap,
   } else {
     printf("\nWriting....\n");
     printf(_("  Can write CD-RW           : %s\n"), 
-	   i_read_cap & CDIO_DRIVE_CAP_READ_CD_RW     ? "Yes" : "No");
+	   i_read_cap & CDIO_DRIVE_CAP_WRITE_CD_RW     ? "Yes" : "No");
     printf(_("  Can write DVD-R           : %s\n"), 
-	   i_write_cap & CDIO_DRIVE_CAP_READ_DVD_R    ? "Yes" : "No");
+	   i_write_cap & CDIO_DRIVE_CAP_WRITE_DVD_R    ? "Yes" : "No");
     printf(_("  Can write DVD-RAM         : %s\n"), 
-	   i_write_cap & CDIO_DRIVE_CAP_READ_DVD_RAM  ? "Yes" : "No");
+	   i_write_cap & CDIO_DRIVE_CAP_WRITE_DVD_RAM  ? "Yes" : "No");
+    printf(_("  Can write DVD-RW          : %s\n"), 
+	   i_write_cap & CDIO_DRIVE_CAP_WRITE_DVD_RW   ? "Yes" : "No");
+    printf(_("  Can write DVD+RW          : %s\n"), 
+	   i_write_cap & CDIO_DRIVE_CAP_WRITE_DVD_RPW  ? "Yes" : "No");
   }
 }