diff --git a/ChangeLog b/ChangeLog
index 53ad372f0..aaeeb05a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* gentpl.py: Make mans depend on grub-mkconfig_lib.
+
+2012-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/list.h (FOR_LIST_ELEMENTS_SAFE): New macro.
+	* include/grub/command.h (FOR_COMMANDS_SAFE): Likewise.
+	* grub-core/commands/help.c (grub_cmd_help): Use FOR_COMMANDS_SAFE.
+
 2012-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/i386/linux.c (find_efi_mmap_size): Don't decrease
diff --git a/gentpl.py b/gentpl.py
index 13a60816f..bab4a8aac 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -487,7 +487,7 @@ def installdir(default="bin"):
 def manpage():
     r  = "if COND_MAN_PAGES\n"
     r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
-    r += rule("[+ name +].[+ mansection +]", "[+ name +]", """
+    r += rule("[+ name +].[+ mansection +]", "[+ name +] grub-mkconfig_lib", """
 chmod a+x [+ name +]
 PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
 """)