diff --git a/doc/check-seclevel.py b/doc/check-seclevel.py
index d403f1dab2..cb9840d95e 100755
--- a/doc/check-seclevel.py
+++ b/doc/check-seclevel.py
@@ -79,7 +79,7 @@ def checkhghelps(ui):
     errorcnt = 0
     for names, sec, doc in helptable:
         if callable(doc):
-            doc = doc()
+            doc = doc(ui)
         errorcnt += checkseclevel(ui, doc,
                                   '%s help topic' % names[0],
                                   initlevel_topic)
diff --git a/doc/gendoc.py b/doc/gendoc.py
index 90fde54806..abfd12296b 100644
--- a/doc/gendoc.py
+++ b/doc/gendoc.py
@@ -138,7 +138,7 @@ def helpprinter(ui, helptable, sectionfunc, include=[], exclude=[]):
         if sectionfunc:
             ui.write(sectionfunc(sec))
         if callable(doc):
-            doc = doc()
+            doc = doc(ui)
         ui.write(doc)
         ui.write("\n")
 
diff --git a/mercurial/help.py b/mercurial/help.py
index 6481b97c0d..7118a6f97b 100644
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -34,8 +34,8 @@ def listexts(header, exts, indent=1, showdeprecated=False):
             rst.append('%s:%s: %s\n' % (' ' * indent, name, desc))
     return rst
 
-def extshelp():
-    rst = loaddoc('extensions')().splitlines(True)
+def extshelp(ui):
+    rst = loaddoc('extensions')(ui).splitlines(True)
     rst.extend(listexts(
         _('enabled extensions:'), extensions.enabled(), showdeprecated=True))
     rst.extend(listexts(_('disabled extensions:'), extensions.disabled()))
@@ -83,7 +83,7 @@ def indicateomitted(rst, omitted, notomitted=None):
     if notomitted:
         rst.append('\n\n.. container:: notomitted\n\n    %s\n\n' % notomitted)
 
-def topicmatch(kw):
+def topicmatch(ui, kw):
     """Return help topics matching kw.
 
     Returns {'section': [(name, summary), ...], ...} where section is
@@ -101,7 +101,7 @@ def topicmatch(kw):
         # Old extensions may use a str as doc.
         if (sum(map(lowercontains, names))
             or lowercontains(header)
-            or (callable(doc) and lowercontains(doc()))):
+            or (callable(doc) and lowercontains(doc(ui)))):
             results['topics'].append((names[0], header))
     import commands # avoid cycle
     for cmd, entry in commands.table.iteritems():
@@ -139,7 +139,7 @@ def topicmatch(kw):
 def loaddoc(topic):
     """Return a delayed loader for help/topic.txt."""
 
-    def loader():
+    def loader(ui):
         docdir = os.path.join(util.datapath, 'help')
         path = os.path.join(docdir, topic + ".txt")
         doc = gettext(util.readfile(path))
@@ -415,7 +415,7 @@ def help_(ui, name, unknowncmd=False, full=True, **opts):
         if not doc:
             rst.append("    %s\n" % _("(no help text available)"))
         if callable(doc):
-            rst += ["    %s\n" % l for l in doc().splitlines()]
+            rst += ["    %s\n" % l for l in doc(ui).splitlines()]
 
         if not ui.verbose:
             omitted = _('(some details hidden, use --verbose'
@@ -482,7 +482,7 @@ def help_(ui, name, unknowncmd=False, full=True, **opts):
     rst = []
     kw = opts.get('keyword')
     if kw:
-        matches = topicmatch(name)
+        matches = topicmatch(ui, name)
         helpareas = []
         if opts.get('extension'):
             helpareas += [('extensions', _('Extensions'))]
diff --git a/tests/test-help.t b/tests/test-help.t
index 942584988a..d35dcf9725 100644
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -1105,7 +1105,7 @@ Test omit indicating for help
   > def extsetup(ui):
   >     help.helptable.append((["topic-containing-verbose"],
   >                            "This is the topic to test omit indicating.",
-  >                            lambda : testtopic))
+  >                            lambda ui: testtopic))
   > EOF
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH