diff --git a/release/doc/share/sgml/release.dsl b/release/doc/share/sgml/release.dsl
index 531a3f5363f3..3a10f5aaebba 100644
--- a/release/doc/share/sgml/release.dsl
+++ b/release/doc/share/sgml/release.dsl
@@ -8,21 +8,72 @@
   <style-specification use="docbook">
     <style-specification-body>
 
-; The architecture we're building for.  We need to define this as a
-; procedure, because we may not be able to evaluate it until we are
-; at a point in formatting where (current-node) is defined.
+; String manipulation functions
+(define (split-string-to-list STR)
+  ;; return list of STR separated with char #\ or #\,
+  (if (string? STR)
+      (let loop ((i (string-delim-index STR)))
+        (cond ((equal? (cdr i) '()) '())
+              (else (cons (substring STR (list-ref i 0) (- (list-ref i 1) 1))
+                          (loop (cdr i))))))
+      '()))
 
+(define (string-delim-index STR)
+  ;; return indexes of STR separated with char #\ or #\,
+  (if (string? STR)
+      (let ((strlen (string-length STR)))
+        (let loop ((i 0))
+          (cond ((= i strlen) (cons (+ strlen 1) '()))
+                ((= i 0)      (cons i (loop (+ i 1))))
+                ((or (equal? (string-ref STR i) #\ )
+                     (equal? (string-ref STR i) #\,)) (cons (+ i 1) (loop (+ i 1))))
+                (else (loop (+ i 1))))))
+      '()
+      ))
+
+(define (string-list-match? STR STR-LIST)
+  (let loop ((s STR-LIST))
+    (cond
+     ((equal? s #f) #f)
+     ((equal? s '()) #f)
+     ((equal? (car s) #f) #f)
+     ((equal? STR (car s)) #t)
+     (else (loop (cdr s))))))
+
+; Deal with conditional inclusion of text via entities.
 (default
   (let* ((arch (attribute-string (normalize "arch")))
 	 (for-arch (entity-text "arch")))
-    (if (or (equal? arch #f)
-	    (equal? arch ""))
-	(next-match)
-; We can do a lot more flexible things here.  Like it'd be nice to
-; tokenize the arch= attribute and do comparisons of for-arch against
-; different substrings.
-	(cond ((equal? arch for-arch) (next-match))
-	      (else (empty-sosofo))))))
+    (cond
+
+     ; If arch= not specified, then print unconditionally.  This clause
+     ; handles the majority of cases.
+     ((or (equal? arch #f) (equal? arch ""))
+      (next-match))
+
+     ; arch= specified, see if it's equal to "all".  If so, then
+     ; print unconditionally.  Note that this clause could be
+     ; combined with the check to see if arch= wasn't specified
+     ; or was empty; they have the same outcome.
+     ((equal? arch "all")
+      (next-match))
+
+     ; arch= specified.  If we're building for all architectures,
+     ; then print it prepended with the set of architectures to which
+     ; this element applies.
+     ;
+     ; XXX This doesn't work.
+;     ((equal? for-arch "all")
+;      (sosofo-append (literal "[") (literal arch) (literal "] ")
+;		     (process-children)))
+
+     ; arch= specified, so we need to check to see if the specified
+     ; parameter includes the architecture we're building for.
+     ((string-list-match? for-arch (split-string-to-list arch))
+      (next-match))
+
+     ; None of the above
+     (else (empty-sosofo)))))
 
 ; We might have some sect1 level elements where the modification times
 ; are significant.  An example of this is the "What's New" section in