diff --git a/0485-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0485-Don-t-require-a-password-to-boot-entries-generated-b.patch
new file mode 100644
index 0000000..cf2086f
--- /dev/null
+++ b/0485-Don-t-require-a-password-to-boot-entries-generated-b.patch
@@ -0,0 +1,31 @@
+From 620f2b6d613c1a1c176a24d338ebb112e9db0c1d Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 11 Feb 2014 11:14:50 -0500
+Subject: [PATCH] Don't require a password to boot entries generated by
+ grub-mkconfig.
+
+When we set a password, we just want that to mean you can't /edit/ an entry.
+
+Resolves: rhbz#1030176
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ util/grub.d/10_linux.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index acf2e0e..136abd7 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+ 
+-CLASS="--class gnu-linux --class gnu --class os"
++CLASS="--class gnu-linux --class gnu --class os --unrestricted"
+ 
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+   OS="$(sed 's, release .*$,,g' /etc/system-release)"
+-- 
+1.8.5.3
+
diff --git a/grub2.spec b/grub2.spec
index 338343b..5ea89a3 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -41,7 +41,7 @@
 Name:           grub2
 Epoch:          1
 Version:        2.00
-Release:        25%{?dist}
+Release:        26%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -538,6 +538,7 @@ Patch0481: 0481-Revert-Add-bootpath-device-to-the-list-967862.patch
 Patch0482: 0482-Fix-net_bootp-cmd-crash-when-there-isn-t-network-car.patch
 Patch0483: 0483-Initialize-grub_file_filters_-all-enabled.patch
 Patch0484: 0484-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+Patch0485: 0485-Don-t-require-a-password-to-boot-entries-generated-b.patch
 
 BuildRequires:  flex bison binutils python
 BuildRequires:  ncurses-devel xz-devel
@@ -940,6 +941,9 @@ fi
 %{_datarootdir}/grub/themes/
 
 %changelog
+* Mon Jun 23 2014 Adam Williamson <awilliam@redhat.com> - 2.00-26
+- Don't require password to boot normally - #840204
+
 * Sat Aug 10 2013 Peter Jones <pjones@redhat.com> - 2.00-25
 - Last build failed because of a hardware error on the builder.