diff --git a/collects/scribblings/mzc/plt.scrbl b/collects/scribblings/mzc/plt.scrbl
index 780dfd24e7..2e7506dd04 100644
--- a/collects/scribblings/mzc/plt.scrbl
+++ b/collects/scribblings/mzc/plt.scrbl
@@ -121,8 +121,8 @@ collection's @filepath{info.ss} file (see @secref["info.ss" #:doc
 For example, the @filepath{info.ss} file in the @filepath{sirmail} collection
 might contain the following @scheme[info] declaration:
 
-@schemeblock[
-\#lang setup/infotab
+@schememod[
+setup/infotab
 (define name "SirMail")
 (define mred-launcher-libraries (list "sirmail.ss"))
 (define mred-launcher-names (list "SirMail"))
diff --git a/collects/scribblings/reference/info.scrbl b/collects/scribblings/reference/info.scrbl
index d52ffdf56e..54a07acea3 100644
--- a/collects/scribblings/reference/info.scrbl
+++ b/collects/scribblings/reference/info.scrbl
@@ -47,8 +47,8 @@ library of the @filepath{help} collection. It contains definitions for
 three info tags, @scheme[name], @scheme[mzscheme-launcher-libraries], and
 @scheme[mzscheme-launcher-names].  (Note the use of @litchar{#lang}.)
 
-@schemeblock[
-\#lang setup/infotab
+@schememod[
+setup/infotab
 (define name "Help")
 (define mzscheme-launcher-libraries '("help.ss"))
 (define mzscheme-launcher-names     '("PLT Help"))
diff --git a/collects/scribblings/scribble/how-to.scrbl b/collects/scribblings/scribble/how-to.scrbl
index e9305e64f0..f9f6450e22 100644
--- a/collects/scribblings/scribble/how-to.scrbl
+++ b/collects/scribblings/scribble/how-to.scrbl
@@ -59,8 +59,8 @@ EOS
         @schemeidfont{name} field. If you do not already have an
         @filepath{info.ss} module, here's a suitable complete module:
 
-        @schemeblock[
-          \#lang setup/infotab
+        @schememod[
+          setup/infotab
           (define name "Some documentation")
           (define scribblings '(("manual.scrbl" ())))
         ]}
diff --git a/collects/scribblings/setup-plt/setup-plt.scrbl b/collects/scribblings/setup-plt/setup-plt.scrbl
index 6d21539e28..dfb90b55ae 100644
--- a/collects/scribblings/setup-plt/setup-plt.scrbl
+++ b/collects/scribblings/setup-plt/setup-plt.scrbl
@@ -8,6 +8,7 @@
                     setup/option-unit
                     setup/option-sig
                     setup/dirs
+                    ;; setup/infotab -- no bindings from this are used
                     setup/getinfo
                     setup/plt-installer
                     setup/plt-installer-sig
@@ -902,6 +903,13 @@ An @deftech{unpackable} is one of the following:
 
 @section[#:tag "getinfo"]{Reading @filepath{info.ss} Files}
 
+@defmodulelang[setup/infotab]{@filepath{info.ss} use the
+@schememodname[setup/infotab] language, which allows simple
+definitions and a few constructors (like @scheme[list] and
+@scheme[build-path]).  Furthermore, the functions that are described
+below require an @filepath{info.ss} to be in a specific shape, so you
+cannot use a different module for these files.}
+
 @defmodule[setup/getinfo]{ The @schememodname[setup/getinfo] library
    provides functions for accessing fields in @filepath{info.ss}
    files.}
@@ -922,9 +930,9 @@ An @deftech{unpackable} is one of the following:
    Accepts a path to a directory. It returns @scheme[#f] if there is
    no @filepath{info.ss} file in the directory. If the
    @filepath{info.ss} file has the wrong shape (i.e., not a module
-   using @scheme[(lib "infotab.ss" "setup")] or
-   @scheme[setup/infotab]), or if the @filepath{info.ss} file fails to
-   load, then an exception is raised.
+   using @scheme[setup/infotab] or @scheme[(lib "infotab.ss" "setup")]),
+   or if the @filepath{info.ss} file fails to load, then an exception
+   is raised.
 
    Otherwise, @scheme[get-info/full] returns an info procedure of one
    or two arguments. The first argument to the info procedure is
diff --git a/collects/scribblings/tools/tools.scrbl b/collects/scribblings/tools/tools.scrbl
index e119cad578..be0c0818d8 100644
--- a/collects/scribblings/tools/tools.scrbl
+++ b/collects/scribblings/tools/tools.scrbl
@@ -152,8 +152,8 @@ DrScheme continues to start up, without the tool.
 
 For example, if the @File{info.ss} file in a collection
 contains:
-@schemeblock[
-\#lang setup/infotab
+@schememod[
+setup/infotab
 (define name "Tool Name")
 (define tools (list (list "tool.ss")))
 ]
@@ -258,8 +258,8 @@ The lists must have the same length.
 
 As an example, the @italic{Essentials of Programming Languages}
 language specification's @File{info.ss} looks like this:
-@schemeblock[
-\#lang setup/infotab
+@schememod[
+setup/infotab
 (require string-constants/string-constant)
 (define name "EoPL Support")
 (define drscheme-language-modules