diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index eb75c61b0b22..02138c6cf968 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1982, 1986, 1993
+ * Copyright (c) 1982, 1986, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,8 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)dkbad.h	8.1 (Berkeley) 6/2/93
- * $Id: dkbad.h,v 1.4 1994/12/11 23:20:50 bde Exp $
+ *	@(#)dkbad.h	8.2 (Berkeley) 7/10/94
+ * $Id: dkbad.h,v 1.6 1996/02/24 05:25:02 hsu Exp $
  */
 
 #ifndef _SYS_DKBAD_H_
@@ -63,12 +63,12 @@
 #define	DKBAD_NOTRKSEC	0xffff		/* track/sector to mark end */
 
 struct dkbad {
-	long bt_csn;			/* cartridge serial number */
-	u_short bt_mbz;			/* unused; should be 0 */
-	u_short bt_flag;		/* -1 => alignment cartridge */
+	int32_t   bt_csn;		/* cartridge serial number */
+	u_int16_t bt_mbz;		/* unused; should be 0 */
+	u_int16_t bt_flag;		/* -1 => alignment cartridge */
 	struct bt_bad {
-		u_short bt_cyl;		/* cylinder number of bad sector */
-		u_short bt_trksec;	/* track and sector number */
+		u_int16_t bt_cyl;	/* cylinder number of bad sector */
+		u_int16_t bt_trksec;	/* track and sector number */
 	} bt_bad[DKBAD_MAXBAD];
 };