diff --git a/basis/tools/scaffold/scaffold-tests.factor b/basis/tools/scaffold/scaffold-tests.factor
index 17f1f02df1..ce96a0cab8 100644
--- a/basis/tools/scaffold/scaffold-tests.factor
+++ b/basis/tools/scaffold/scaffold-tests.factor
@@ -20,6 +20,14 @@ IN: tools.scaffold.tests
     [ \ undocumented-word (help.) ] with-string-writer
 ] unit-test
 
+{
+"HELP: iota-tuple
+{ $class-description \"\" } ;
+" }
+[
+    [ \ iota-tuple (help.) ] with-string-writer
+] unit-test
+
 { sequence t } [ "seq" lookup-type ] unit-test
 { sequence t } [ "seq'" lookup-type ] unit-test
 { sequence t } [ "newseq" lookup-type ] unit-test
diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index 00cf2297b5..003c90e14c 100644
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -185,6 +185,10 @@ M: object add-using ( object -- )
         ] if
     ] when* ;
 
+: class-description. ( word -- )
+    drop
+    "{ $class-description \"\" } ;" print ;
+
 : symbol-description. ( word -- )
     drop
     "{ $var-description \"\" } ;" print ;
@@ -194,11 +198,11 @@ M: object add-using ( object -- )
     "{ $description \"\" } ;" print ;
 
 : docs-body. ( word/symbol -- )
-    dup symbol? [
-        symbol-description.
-    ] [
-        [ $values. ] [ $description. ] bi
-    ] if ;
+    {
+        { [ dup class? ] [ class-description. ] }
+        { [ dup symbol? ] [ symbol-description. ] }
+        [ [ $values. ] [ $description. ] bi ]
+    } cond ;
 
 : docs-header. ( word -- )
     "HELP: " write name>> print ;