diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index c0676e4fc191..6ecef659844c 100644
--- a/sys/cam/scsi/scsi_sa.h
+++ b/sys/cam/scsi/scsi_sa.h
@@ -477,7 +477,7 @@ struct scsi_medium_type_data {
 	u_int8_t length[2];
 #define	SMTD_DEFAULT_LENGTH	52
 	u_int8_t num_density_codes;
-	u_int8_t primary_density_codes[8];
+	u_int8_t primary_density_codes[9];
 	u_int8_t media_width[2];
 	u_int8_t medium_length[2];
 	u_int8_t reserved2[2];
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 31668318fce6..fa66148587b5 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -1406,9 +1406,9 @@ mt_print_density_entry(struct mt_status_entry *density_root, int indent)
 				continue;
 		}
 		if ((strcmp(entry->entry_name, "primary_density_code") == 0)
-		 || (strcmp(entry->entry_name, "secondary_density_code") == 0)){
+		 || (strcmp(entry->entry_name, "secondary_density_code") == 0)
+		 || (strcmp(entry->entry_name, "density_code") == 0)) {
 
-			/* XXX KDM this should really be unsigned */
 			printf("%*s%s (%s): %s\n", indent, "", entry->desc ?
 			    entry->desc : "", entry->entry_name,
 			    denstostring(entry->value_unsigned));