diff --git a/ChangeLog b/ChangeLog
index d081eccd0..e72f8cd31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-05  Pavel Roskin  <proski@gnu.org>
+
+	* util/grub.d/10_freebsd.in: Fix spelling of `device.hints' on
+	FreeBSD.
+	* util/osdetect.lua: Likewise.
+
 2009-07-05  Bean  <bean123ch@gmail.com>
 
 	* conf/common.rmk (lua_mode_SOURCES): Add script/lua/lstrlib.c.
diff --git a/util/grub.d/10_freebsd.in b/util/grub.d/10_freebsd.in
index 11e3a25c4..2addf03a1 100644
--- a/util/grub.d/10_freebsd.in
+++ b/util/grub.d/10_freebsd.in
@@ -26,8 +26,8 @@ case "${GRUB_DISTRIBUTOR}" in
   *)		OS="FreeBSD" ;;
 esac
 
-if test -e /boot/devices.hints ; then
-  devices=/boot/devices.hints
+if test -e /boot/device.hints ; then
+  devices=/boot/device.hints
 fi
 
 if test -e /boot/kernel/kernel ; then
diff --git a/util/osdetect.lua b/util/osdetect.lua
index c57d61224..38a90993d 100644
--- a/util/osdetect.lua
+++ b/util/osdetect.lua
@@ -59,7 +59,7 @@ function enum_device (device, fs, uuid)
   elseif (grub.file_exist (root .. "kernel.sys")) then
     title = "FreeDOS"
   elseif (grub.file_exist (root .. "boot/loader") and
-	  grub.file_exist (root .. "boot/devices.hints")) then
+	  grub.file_exist (root .. "boot/device.hints")) then
     source = "root (" .. device .. ")\nfreebsd /boot/loader" ..
       "\nfreebsd_loadenv /boot/device.hints"
     title = "FreeBSD"