diff --git a/doc/dom.html b/doc/dom.html
index 665cad8..95d93b9 100644
--- a/doc/dom.html
+++ b/doc/dom.html
@@ -63,6 +63,11 @@
       <tt>unparse-document</tt> as a thin wrapper around
       <tt>map-document</tt>.
     </p>
+    <p>
+      Applications dealing with namespaces might want to inject a
+      <a href="using.html#misc">namespace normalizer</a> into the
+      sink chain.
+    </p>
     <p>
       <div class="def">Function DOM:MAP-DOCUMENT (handler document &key include-xmlns-attributes include-default-values include-doctype)</div>
       Traverse a DOM document and call SAX functions as if an XML
@@ -111,11 +116,6 @@
         doctype declaration will be written that includes notations
         declared in the document.
       </li>
-      <li>
-        If namespace processing is enabled
-        (<tt>sax:*namespace-processing*</tt>), a <a
-        href="using.html#misc">namespace normalizer</a> is used.
-      </li>
     </ul>
     <p>
       <tt>unparse-document-to-octets</tt> returns an <tt>(unsigned-byte
diff --git a/dom/unparse.lisp b/dom/unparse.lisp
index ceadbd1..120835f 100644
--- a/dom/unparse.lisp
+++ b/dom/unparse.lisp
@@ -1,8 +1,6 @@
 (in-package :cxml)
 
 (defun %unparse-document (sink doc canonical)
-  (when sax:*namespace-processing*
-    (setf sink (cxml:make-namespace-normalizer sink)))
   (dom:map-document sink
 		    doc
 		    :include-doctype (if (and canonical (>= canonical 2))
@@ -15,8 +13,7 @@
 		     doc
 		     canonical))
 
-(defun unparse-document (doc character-stream &rest initargs &key canonical)
-  (%unparse-document
-   (apply #'make-character-stream-sink character-stream initargs)
-   doc
-   canonical))
+(defun unparse-document (doc stream &rest initargs &key canonical)
+  (%unparse-document (apply #'make-character-stream-sink stream initargs)
+		     doc
+		     canonical))