diff --git a/ChangeLog b/ChangeLog
index 3788f8377..2b70f0d57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-11-15  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* grub-core/Makefile.core.def (signature_test): Add missing
+	tests/signatures.h.
+
+2013-11-14  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-install_header: Set localedir here, since this file is
+	where it's used.
+	* util/grub-install.in: Remove setting of localedir.
+	* util/grub-mkrescue.in: Likewise.
+
 2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.am (default_payload.elf): Add uhci, ohci and usb_keyboard.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 611451938..4fff57f16 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1914,6 +1914,7 @@ module = {
 module = {
   name = signature_test;
   common = tests/signature_test.c;
+  common = tests/signatures.h;
 };
 
 module = {
diff --git a/util/grub-install.in b/util/grub-install.in
index 4cddf5eda..c022a6bb9 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -22,7 +22,6 @@ sysconfdir="@sysconfdir@"
 
 host_os=@host_os@
 target=
-localedir="@datadir@/locale"
 
 grub_probe="${sbindir}/@grub_probe@"
 grub_editenv="${bindir}/@grub_editenv@"
diff --git a/util/grub-install_header b/util/grub-install_header
index 26013fe59..2759ae89e 100644
--- a/util/grub-install_header
+++ b/util/grub-install_header
@@ -29,6 +29,7 @@ datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
     pkgdatadir="${datadir}/@PACKAGE@"
 fi
+localedir="@datadir@/locale"
 
 self=`basename $0`
 
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 5a04ec4b6..444ef85fd 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -44,8 +44,6 @@ product_version="${PACKAGE_VERSION}"
 
 xorriso=xorriso
 
-localedir="@datadir@/locale"
-
 # Usage: usage
 # Print the usage.
 usage () {