diff --git a/ChangeLog b/ChangeLog
index c66fcb482..d4d6e84fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/Makefile.common (grubdatadir): Removed.
+	(Makefile.am): Move eveything grubdata to pkgdata.
+
 2012-02-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/acpihalt.c (get_sleep_type):
diff --git a/Makefile.am b/Makefile.am
index 24bf9f86a..6f17e8079 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,7 +62,7 @@ CLEANFILES += grub_fstest_init.c
 
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
-grubdata_DATA = unicode.pf2 ascii.pf2 euro.pf2 ascii.h widthspec.h
+pkgdata_DATA += unicode.pf2 ascii.pf2 euro.pf2 ascii.h widthspec.h
 endif
 endif
 
diff --git a/conf/Makefile.common b/conf/Makefile.common
index b960bdf81..2f5def49d 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -99,7 +99,6 @@ CCASFLAGS_LIBRARY =
 # Other variables
 
 grubconfdir = $(sysconfdir)/grub.d
-grubdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
 platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers