diff --git a/ChangeLog b/ChangeLog
index d217a498c..b9a7dcaf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Replace PACKAGE_TARNAME with PACKAGE in pkglibdir and pkgdatadir.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* po/POTFILES.in: Regenerated.
diff --git a/util/grub-install.in b/util/grub-install.in
index 5df7bf40e..c263f8a4c 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -32,10 +32,10 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
 host_os=@host_os@
-pkglibdir="${libdir}/${PACKAGE_TARNAME}/${target_cpu}-${platform}"
+pkglibdir="${libdir}/@PACKAGE@/${target_cpu}-${platform}"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 localedir="@datadir@/locale"
 
diff --git a/util/grub-kbdcomp.in b/util/grub-kbdcomp.in
index 87c0100b6..c24a65ceb 100644
--- a/util/grub-kbdcomp.in
+++ b/util/grub-kbdcomp.in
@@ -8,7 +8,7 @@ bindir="@bindir@"
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 
 grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`"
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index ecccf3b58..0dcc48393 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -32,7 +32,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 host_os=@host_os@
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 grub_cfg=""
 grub_mkconfig_dir="${sysconfdir}"/grub.d
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index ef0cf6c35..e776ef07b 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -22,7 +22,7 @@ datarootdir="@datarootdir@"
 datadir="@datadir@"
 bindir="@bindir@"
 sbindir="@sbindir@"
-pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+pkgdatadir="${datadir}/@PACKAGE@"
 
 if test "x$grub_probe" = x; then
   grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
index 7db6c4512..4d066da0d 100644
--- a/util/grub-mknetdir.in
+++ b/util/grub-mknetdir.in
@@ -31,7 +31,7 @@ host_os=@host_os@
 pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 
 self=`basename $0`
@@ -46,13 +46,13 @@ recheck=no
 debug=no
 debug_image=
 subdir=`echo /boot/grub | sed ${transform}`
-pc_dir="${libdir}/${PACKAGE_TARNAME}/i386-pc"
-ppc_dir="${libdir}/${PACKAGE_TARNAME}/powerpc-ieee1275"
-sparc_dir="${libdir}/${PACKAGE_TARNAME}/sparc64-ieee1275"
-i386_ieee1275_dir="${libdir}/${PACKAGE_TARNAME}/i386-ieee1275"
-efi32_dir="${libdir}/${PACKAGE_TARNAME}/i386-efi"
-efi64_dir="${libdir}/${PACKAGE_TARNAME}/x86_64-efi"
-itanium_dir="${libdir}/${PACKAGE_TARNAME}/ia64-efi"
+pc_dir="${libdir}/@PACKAGE@/i386-pc"
+ppc_dir="${libdir}/@PACKAGE@/powerpc-ieee1275"
+sparc_dir="${libdir}/@PACKAGE@/sparc64-ieee1275"
+i386_ieee1275_dir="${libdir}/@PACKAGE@/i386-ieee1275"
+efi32_dir="${libdir}/@PACKAGE@/i386-efi"
+efi64_dir="${libdir}/@PACKAGE@/x86_64-efi"
+itanium_dir="${libdir}/@PACKAGE@/ia64-efi"
 
 . "${pkgdatadir}/grub-mkconfig_lib"
 
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 6221e60d6..d09d95339 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -31,18 +31,18 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 
 self=`basename $0`
 
-multiboot_dir="${libdir}/${PACKAGE_TARNAME}/i386-multiboot"
-coreboot_dir="${libdir}/${PACKAGE_TARNAME}/i386-coreboot"
-qemu_dir="${libdir}/${PACKAGE_TARNAME}/i386-qemu"
-pc_dir="${libdir}/${PACKAGE_TARNAME}/i386-pc"
-efi32_dir="${libdir}/${PACKAGE_TARNAME}/i386-efi"
-efi64_dir="${libdir}/${PACKAGE_TARNAME}/x86_64-efi"
+multiboot_dir="${libdir}/@PACKAGE@/i386-multiboot"
+coreboot_dir="${libdir}/@PACKAGE@/i386-coreboot"
+qemu_dir="${libdir}/@PACKAGE@/i386-qemu"
+pc_dir="${libdir}/@PACKAGE@/i386-pc"
+efi32_dir="${libdir}/@PACKAGE@/i386-efi"
+efi64_dir="${libdir}/@PACKAGE@/x86_64-efi"
 rom_directory=
 override_dir=
 grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
index 2adf5b726..5a632501e 100644
--- a/util/grub-mkstandalone.in
+++ b/util/grub-mkstandalone.in
@@ -32,7 +32,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 
 self=`basename $0`
@@ -58,7 +58,7 @@ usage () {
     printf "  -v, --version           %s\n" "$(gettext "print the version information and exit")"
     printf "  -o, --output=%-11s%s\n" "$(gettext FILE)" "$(gettext "save output in FILE [required]")"
     # TRANSLATORS: platform here isn't identifier. It can be translated.
-    dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/${PACKAGE_TARNAME}")"
+    dir_msg="$(gettext_printf "use images and modules under DIR [default=%s/<platform>]" "${libdir}/@PACKAGE@")"
     printf "  -d, --directory=%-8s%s\n" \
 	"DIR" "$dir_msg"
     printf     "  -O, --format=%-11s%s" "$(gettext "FORMAT")" "$(gettext "generate an image in format")"; echo
@@ -155,7 +155,7 @@ if [ "x$source_directory" = x ] ; then
 	mips-loongson)
 	    cpu=mipsel ;;
     esac
-    source_directory="${libdir}/${PACKAGE_TARNAME}/$cpu-$platform"
+    source_directory="${libdir}/@PACKAGE@/$cpu-$platform"
 fi
 
 . "${source_directory}"/modinfo.sh
diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index 9a04cb8b0..b784d4107 100644
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -27,7 +27,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 
 self=`basename $0`
diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index 9429d3c91..8fa86089c 100644
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -27,7 +27,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 
 self=`basename $0`
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 02edf8d55..41bd4f513 100644
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -29,11 +29,11 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
-pkglibdir="${libdir}/${PACKAGE_TARNAME}/${target_cpu}-${platform}"
+pkglibdir="${libdir}/@PACKAGE@/${target_cpu}-${platform}"
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
-    pkgdatadir="${datadir}/@PACKAGE_TARNAME@"
+    pkgdatadir="${datadir}/@PACKAGE@"
 fi
 
 self=`basename $0`