diff --git a/debian/changelog b/debian/changelog
index af491e8e1..2d60557a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grub2 (1.99-10) UNRELEASED; urgency=low
+
+  * Mark la_array as packed.
+    - zfs_packed_la_array.patch
+
+ -- Robert Millan <rmh@debian.org>  Wed, 03 Aug 2011 14:18:17 +0200
+
 grub2 (1.99-9) unstable; urgency=low
 
   [ Colin Watson ]
diff --git a/debian/patches/series b/debian/patches/series
index 48c5380ee..8f34aa827 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ btrfs_stat.patch
 partition_performance.patch
 kfreebsd-9_ada_devices.patch
 gfxterm_background.patch
+zfs_packed_la_array.patch
diff --git a/debian/patches/zfs_packed_la_array.patch b/debian/patches/zfs_packed_la_array.patch
new file mode 100644
index 000000000..e31778bb8
--- /dev/null
+++ b/debian/patches/zfs_packed_la_array.patch
@@ -0,0 +1,17 @@
+2011-08-03  Robert Millan  <rmh@gnu.org>
+
+	* include/grub/zfs/zap_leaf.h (typedef union zap_leaf_chunk): Mark
+	la_array as packed.
+	Reported by: Zachary Bedell
+
+--- a/include/grub/zfs/zap_leaf.h
++++ b/include/grub/zfs/zap_leaf.h
+@@ -90,7 +90,7 @@
+ 		{
+ 			grub_uint8_t la_array[ZAP_LEAF_ARRAY_BYTES];
+ 			grub_uint64_t la_array64;
+-		};
++		} __attribute__ ((packed));
+ 		grub_uint16_t la_next;		/* next blk or CHAIN_END */
+ 	} l_array;
+ 	struct zap_leaf_free {