diff --git a/ChangeLog b/ChangeLog
index b9a7dcaf2..c28f0891e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mknetdir.in (grub_prefix): Removed.
+	(subdir): Use @bootdirname@ and @grubdirname@.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Replace PACKAGE_TARNAME with PACKAGE in pkglibdir and pkgdatadir.
diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
index 4d066da0d..a8913474e 100644
--- a/util/grub-mknetdir.in
+++ b/util/grub-mknetdir.in
@@ -38,14 +38,13 @@ self=`basename $0`
 
 grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
 rootdir=/srv/tftp
-grub_prefix=`echo /boot/grub | sed ${transform}`
 modules=
 
 no_floppy=
 recheck=no
 debug=no
 debug_image=
-subdir=`echo /boot/grub | sed ${transform}`
+subdir="`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`"
 pc_dir="${libdir}/@PACKAGE@/i386-pc"
 ppc_dir="${libdir}/@PACKAGE@/powerpc-ieee1275"
 sparc_dir="${libdir}/@PACKAGE@/sparc64-ieee1275"