diff --git a/Makefile.in b/Makefile.in
index 82cc0987a..6f08d5a6f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,6 +49,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+PACKAGE = @PACKAGE@
+
 host_os = @host_os@
 host_kernel = @host_kernel@
 host_cpu = @host_cpu@
@@ -308,7 +310,7 @@ install-local: all
 	@list='po/$(lang).mo'; \
 	for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$(lang)/LC_MESSAGES/grub.mo; \
+	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$(lang)/LC_MESSAGES/$(PACKAGE).mo; \
 	done)
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
 	@list='$(info_INFOS)'; \
diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c
index 86f480835..94819bdab 100644
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/i386/pc/grub-mkimage.c
@@ -353,7 +353,7 @@ main (int argc, char *argv[])
 
   progname = "grub-mkimage";
 
-  textdomain ("grub");
+  textdomain (PACKAGE);
 
   while (1)
     {