diff --git a/Makefile.am b/Makefile.am
index d962963c1..c0d6d003b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,8 @@ AM_LDFLAGS =
 AM_CPPFLAGS = $(CPPFLAGS_GRUB) -DGRUB_FILE=\"$(subst $(top_srcdir)/,,$<)\"
 AM_CCASFLAGS = -DASM_FILE=1
 
+include $(srcdir)/modules.am
+
 # XXX Use Automake's LEX & YACC support
 grub_script.tab.c grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/grub-core/script/parser.y
@@ -83,5 +85,3 @@ ascii.h: ascii.bitmaps grub-bin2h
 CLEANFILES += ascii.h $(top_builddir)/grub-core/include/ascii.h
 
 platform_HEADERS = config.h
-
-include $(srcdir)/modules.am
diff --git a/gentpl.py b/gentpl.py
index d6043d05c..f906bd6d1 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -329,7 +329,7 @@ def installdir(default="bin"):
 
 def manpage():
     r  = "if COND_MAN_PAGES\n"
-    r += "man_MANS += [+ name +].[+ mansection +]\n"
+    r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
     r += rule("[+ name +].[+ mansection +]", "", """
 $(MAKE) $(AM_MAKEFLAGS) [+ name +]
 chmod a+x [+ name +]