diff --git a/stage1/Makefile.am b/stage1/Makefile.am
index 0afc285..a376810 100644
--- a/stage1/Makefile.am
+++ b/stage1/Makefile.am
@@ -1,5 +1,5 @@
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
-nodist_pkglib_DATA = stage1
+pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+nodist_pkgdata_DATA = stage1
 
 CLEANFILES = $(nodist_pkglib_DATA)
 
diff --git a/stage2/Makefile.am b/stage2/Makefile.am
index f8e6d42..6fa8c1e 100644
--- a/stage2/Makefile.am
+++ b/stage2/Makefile.am
@@ -27,12 +27,12 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
 	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
 
 # Stage 2 and Stage 1.5's.
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
 
 EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
 
 if DISKLESS_SUPPORT
-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
 	nbgrub pxegrub
@@ -43,7 +43,7 @@ noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
 	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
 	xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
 else
-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
 noinst_DATA = pre_stage2 start start_eltorito
diff --git a/util/grub-image.in b/util/grub-image.in
index ea63250..e6e728f 100644
--- a/util/grub-image.in
+++ b/util/grub-image.in
@@ -27,7 +27,7 @@ host_cpu=@host_cpu@
 host_os=@host_os@
 host_vendor=@host_vendor@
 context=${host_cpu}-${host_vendor}
-pkglibdir=${libdir}/${PACKAGE}/${context}
+pkgdatadir=${libdir}/${PACKAGE}/${context}
 
 mke2fs=`which mke2fs`
 
@@ -43,8 +43,8 @@ if test -f $thisdir/../stage2/stage2; then
   stage2dir="$thisdir/../stage2"
 else
   grub_shell=${sbindir}/grub
-  stage1dir="$pkglibdir"
-  stage2dir="$pkglibdir"
+  stage1dir="$pkgdatadir"
+  stage2dir="$pkgdatadir"
 fi
 
 # Exit on any error.
diff --git a/util/grub-install.in b/util/grub-install.in
index 2e598b0..0e3e581 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -27,7 +27,7 @@ VERSION=@VERSION@
 host_cpu=@host_cpu@
 host_os=@host_os@
 host_vendor=@host_vendor@
-pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
+pkgdatadir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
 
 grub_shell=${sbindir}/grub
 grub_set_default=${sbindir}/grub-set-default
@@ -303,17 +303,17 @@ else
     exit 1
 fi
 
-if test -f "$pkglibdir/stage1"; then
+if test -f "$pkgdatadir/stage1"; then
     :
 else
-    echo "${pkglibdir}/stage1: Not found." 1>&2
+    echo "${pkgdatadir}/stage1: Not found." 1>&2
     exit 1
 fi
 
-if test -f "$pkglibdir/stage2"; then
+if test -f "$pkgdatadir/stage2"; then
     :
 else
-    echo "${pkglibdir}/stage2: Not found." 1>&2
+    echo "${pkgdatadir}/stage2: Not found." 1>&2
     exit 1
 fi
 
@@ -411,7 +411,7 @@ for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
     rm -f $file || exit 1
 done
 for file in \
-    ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do
+    ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
     cp -f $file ${grubdir} || exit 1
 done