diff --git a/Makefile.am b/Makefile.am
index 9ced44636..99fd490c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 AUTOMAKE_OPTIONS = subdir-objects
-DEPDIR = .deps-util
-EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 
+DEPDIR = .deps-util
 SUBDIRS = . grub-core po docs
+EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 
 include $(top_srcdir)/grub-core/Makefile.vars
 
@@ -32,19 +32,19 @@ grub_script.yy.c grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
 	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/grub-core/script/yylex.l
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
-# For libutil.a
-libutil.pp: grub_script.tab.h grub_script.yy.h $(libutil_a_SOURCES)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutil_a_CPPFLAGS) $(CPPFLAGS) \
+# For libgrub.a
+libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrub_a_SOURCES)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrub_a_CPPFLAGS) $(CPPFLAGS) \
 	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
-CLEANFILES += libutil.pp
+CLEANFILES += libgrub.pp
 
-libutil_a_init.lst: libutil.pp
+libgrub_a_init.lst: libgrub.pp
 	cat $< | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
-CLEANFILES += libutil_a_init.lst
+CLEANFILES += libgrub_a_init.lst
 
-libutil_a_init.c: libutil_a_init.lst $(top_srcdir)/geninit.sh
+libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh
 	sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
-CLEANFILES += libutil_a_init.c
+CLEANFILES += libgrub_a_init.c
 
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 71abb5a7a..61a69fca6 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = po
 DEPDIR = .deps-core
 EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
diff --git a/modules.def b/modules.def
index a91aed83e..5a485f9a5 100644
--- a/modules.def
+++ b/modules.def
@@ -1,13 +1,13 @@
 AutoGen definitions Makefile.tpl;
 
 library = {
-  name = libutil.a;
+  name = libgrub.a;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
 
   nodist = grub_script.tab.c;
   nodist = grub_script.yy.c;
-  nodist = libutil_a_init.c;
+  nodist = libgrub_a_init.c;
 
   source = grub-core/gnulib/error.c;
   source = grub-core/gnulib/fnmatch.c;
@@ -98,7 +98,7 @@ library = {
 program = {
   name = grub-bin2h;
   source = util/bin2h.c;
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   mansection = 1;
   common;
 };
@@ -111,7 +111,7 @@ program = {
   source = util/resolve.c;
   extra_dist = util/grub-mkimagexx.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
 
   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibroot)\"';
   common;
@@ -123,7 +123,7 @@ program = {
 
   source = util/grub-mkrelpath.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -133,7 +133,7 @@ program = {
 
   source = util/grub-script-check.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -143,7 +143,7 @@ program = {
 
   source = util/grub-editenv.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -153,7 +153,7 @@ program = {
 
   source = util/grub-mkpasswd-pbkdf2.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
   common;
@@ -170,7 +170,7 @@ program = {
   mansection = 1;
   source = util/grub-pe2elf.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
 };
 
 program = {
@@ -178,7 +178,7 @@ program = {
   mansection = 1;
   source = util/grub-fstest.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   enable = COND_GRUB_FSTEST;
   common;
 };
@@ -188,7 +188,7 @@ program = {
   mansection = 1;
   source = util/grub-mkfont.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   cflags = '$(freetype_cflags)';
   ldflags = '$(freetype_libs)';
   common;
@@ -208,7 +208,7 @@ program = {
   sparc64_ieee1275 = util/ieee1275/ofpath.c;
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -218,7 +218,7 @@ program = {
   mansection = 8;
   source = util/grub-probe.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -235,7 +235,7 @@ program = {
   sparc64_ieee1275 = util/raid.c;
   sparc64_ieee1275 = util/lvm.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
 };
 
 program = {
@@ -244,7 +244,7 @@ program = {
   source = util/ieee1275/grub-ofpathname.c;
   source = util/ieee1275/ofpath.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   sparc64_ieee1275;
 };