diff --git a/collects/games/chat-noir/chat-noir-doc.ss b/collects/games/chat-noir/chat-noir-doc.ss
deleted file mode 100644
index ccbe5ad6..00000000
--- a/collects/games/chat-noir/chat-noir-doc.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scribble/doc
-@(require "literate-doc-wrapper.ss")
-@(include "chat-noir-literate.ss")
diff --git a/collects/games/chat-noir/literate-doc-wrapper.ss b/collects/games/chat-noir/literate-doc-wrapper.ss
index 5c59a784..a5a0a587 100644
--- a/collects/games/chat-noir/literate-doc-wrapper.ss
+++ b/collects/games/chat-noir/literate-doc-wrapper.ss
@@ -10,11 +10,12 @@
 
 ;; define `chunk' as a macro that typesets the code
 (define-syntax-rule (chunk name expr ...)
-  (make-splice (list (emph (scheme name) " ::=")
+  (make-splice (list (subsection #:tag (format "~a" 'name)
+                                 (scheme name))
                      (schemeblock expr ...))))
 
 ;; HACK: provide a fake `module', which makes it possible to include a module
 ;; and get only its code in.
 (provide module)
-(define-syntax module
-  (syntax-rules () [(module name base body ...) (begin body ...)]))
+(define-syntax-rule (module name base body ...)
+  (begin body ...))