diff --git a/grub2.spec b/grub2.spec
index e0d99da..9248124 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -18,7 +18,7 @@
 Name:           grub2
 Epoch:          1
 Version:        1.99
-Release:        13%{?dist}.1
+Release:        13%{?dist}.2
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -142,6 +142,7 @@ PLATFORM=pc
 %endif
 %configure							\
 	CFLAGS="$(echo $RPM_OPT_FLAGS | sed			\
+		-e 's/-O.//g'					\
 		-e 's/-fstack-protector//g'			\
 		-e 's/--param=ssp-buffer-size=4//g'		\
 		-e 's/-mregparm=3/-mregparm=4/g'		\
@@ -365,6 +366,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar 12 2012 Adam Williamson <awilliam@redhat.com> - 1:1.99-13.2
+- Build with -Os for both grub2-efi and regular grub2 (complete fix for
+  782144) (thanks Ian Collier)
+
 * Fri Feb 17 2012 Orion Poplawski <orion@cora.nwra.com> - 1:1.99-13.1
 - Build with -Os (bug 782144)