diff --git a/sys/dev/nand/nand.h b/sys/dev/nand/nand.h
index 05101acddad9..0d6d7b453d72 100644
--- a/sys/dev/nand/nand.h
+++ b/sys/dev/nand/nand.h
@@ -219,7 +219,7 @@ struct onfi_params {
 	uint16_t	vendor_rev;
 	uint8_t		vendor_spec[8];
 	uint16_t	crc;
-};
+}__attribute__((packed));
 
 struct nand_ecc_data {
 	int	eccsize;		/* Number of data bytes per ECC step */
diff --git a/sys/dev/nand/nandbus.c b/sys/dev/nand/nandbus.c
index 322d708b1658..a79cd4d365f6 100644
--- a/sys/dev/nand/nandbus.c
+++ b/sys/dev/nand/nandbus.c
@@ -331,7 +331,7 @@ static int
 nand_probe_onfi(device_t bus, uint8_t *onfi_compliant)
 {
 	device_t nfc;
-	char onfi_id[] = {'o', 'n', 'f', 'i', '\0'};
+	char onfi_id[] = {'O', 'N', 'F', 'I', '\0'};
 	int i;
 
 	nand_debug(NDBG_BUS,"probing ONFI");