diff --git a/templates/kernel-libc-headers/build.diff b/templates/kernel-libc-headers/build.diff
new file mode 100644
index 00000000000..67a87715122
--- /dev/null
+++ b/templates/kernel-libc-headers/build.diff
@@ -0,0 +1,19 @@
+Replace u8 with __u8 to make this not fail in dependent packages.
+
+--- include/scsi/scsi.h.orig	2009-10-04 19:19:45.667037936 +0200
++++ include/scsi/scsi.h	2009-10-04 19:20:01.397017561 +0200
+@@ -142,10 +142,10 @@ struct scsi_cmnd;
+ 
+ /* defined in T10 SCSI Primary Commands-2 (SPC2) */
+ struct scsi_varlen_cdb_hdr {
+-	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
+-	u8 control;
+-	u8 misc[5];
+-	u8 additional_cdb_length;         /* total cdb length - 8 */
++	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
++	__u8 control;
++	__u8 misc[5];
++	__u8 additional_cdb_length;         /* total cdb length - 8 */
+ 	__be16 service_action;
+ 	/* service specific data follows */
+ };