diff --git a/grub2-once b/grub2-once
index 464d003..4ea17f2 100644
--- a/grub2-once
+++ b/grub2-once
@@ -89,6 +89,13 @@ while (<MENU>) {
 
 close (MENU);
 
+if (open(MENU, "<$grub2_dir/custom.cfg")) {
+    while (<MENU>) {
+	&parse_menuentry ("", $_);
+    }
+    close (MENU);
+}
+
 my $ret = "";
 my $name = "";
 my $id = -1;
diff --git a/grub2.changes b/grub2.changes
index 216feac..b8b1784 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Oct 18 11:45:10 UTC 2015 - eich@suse.com
+
+- Include custom.cfg into the files scanned by grub2-once.
+  Allows to chose manually added entries as well (FATE#319632).
+
 -------------------------------------------------------------------
 Wed Oct  7 09:01:37 UTC 2015 - mchang@suse.com
 
diff --git a/grub2.spec b/grub2.spec
index d7ec470..250b7f0 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed