diff --git a/ChangeLog b/ChangeLog
index 95e7363a2..d0f2acacc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Alexey Shvetsov <alexxy@gentoo.org>
+
+	* util/grub.d/10_linux.in: Add gentoo-specific config filename.
+	* util/grub.d/20_linux_xen.in: Likewise.
+
 2011-03-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub.d/10_linux.in: Try alternative config filenames where
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 4f8a7927c..930ce06ef 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -148,9 +148,9 @@ while [ "x$list" != "x" ] ; do
   done
 
   config=
-  for i in "config-${version}" "config-${alt_version}"; do
-    if test -e "${dirname}/${i}" ; then
-      config="${dirname}/${i}"
+  for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+    if test -e "${i}" ; then
+      config="${i}"
       break
     fi
   done
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 59a953ebb..858627aa3 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -99,9 +99,9 @@ linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
 	version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
 	dirname=$(dirname $i)
 	config=
-	for j in "config-${version}" "config-${alt_version}"; do
-	    if test -e "${dirname}/${j}" ; then
-		config="${dirname}/${j}"
+	for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+	    if test -e "${j}" ; then
+		config="${j}"
 		break
 	    fi
 	done