diff --git a/release/doc/README b/release/doc/README
index 6ed0291f225..b57b10a671d 100644
--- a/release/doc/README
+++ b/release/doc/README
@@ -99,9 +99,10 @@ element will be included.  For example:
 
 	<para arch="sparc64">SPARC64-specific text</para>
 
-The currently-supported architectures are i386, sparc64, and
-ia64.  An element may appear for multiple architectures by specifying
-a comma-separated list of architectures (i.e. arch="sparc64,ia64").
+The currently-supported architectures are amd64, arm, i386, ia64,
+pc98, powerpc, and sparc64.  An element may appear for multiple
+architectures by specifying a comma-separated list of architectures
+(i.e. arch="sparc64,ia64").
 
 When creating a translation, make a new directory under this
 directory with a language code (paralleling the DocProj directory
diff --git a/release/doc/en_US.ISO8859-1/errata/article.sgml b/release/doc/en_US.ISO8859-1/errata/article.sgml
index a765881d722..edb454306b7 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.sgml
+++ b/release/doc/en_US.ISO8859-1/errata/article.sgml
@@ -16,7 +16,6 @@
 
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY release.bugfix "5.2.1-RELEASE">
 ]>
 
 <article>
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index 95d1e495787..d05e35923ea 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -10,23 +10,6 @@ EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 DSLHTML?=	${RELN_ROOT}/share/sgml/default.dsl
 DSLPRINT?=	${RELN_ROOT}/share/sgml/default.dsl
 
-#
-# Tweakable Makefile variables
-#
-# INCLUDE_HISTORIC	Used by relnotes document only.  When set,
-#			causes all release notes entries to be printed,
-#			even those marked as "historic".  If not set
-#			(the default), only print "non-historic"
-#			release note entries.  To designate a release
-#			note entry as "historic", add a role="historic"
-#			attribute to the applicable element(s).
-#
-.if defined(INCLUDE_HISTORIC)
-JADEFLAGS+=	-iinclude.historic
-.else
-JADEFLAGS+=	-ino.include.historic
-.endif
-
 #
 # Automatic device list generation:
 #
diff --git a/release/doc/share/sgml/release.dsl b/release/doc/share/sgml/release.dsl
index dd6ac3e1dfe..66e9ae24a41 100644
--- a/release/doc/share/sgml/release.dsl
+++ b/release/doc/share/sgml/release.dsl
@@ -3,8 +3,6 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.html		"IGNORE">
 <!ENTITY % output.print 	"IGNORE">
-<!ENTITY % include.historic	"IGNORE">
-<!ENTITY % no.include.historic	"IGNORE">
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
 <!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release.ent;
@@ -14,14 +12,6 @@
   <style-specification use="docbook">
     <style-specification-body>
 
-; Configure behavior of this stylesheet
-<![ %include.historic; [
-      (define %include-historic% #t)
-]]>
-<![ %no.include.historic; [
-      (define %include-historic% #f)
-]]>
-
 ; String manipulation functions
 (define (split-string-to-list STR)
   ;; return list of STR separated with char #\ or #\,
@@ -54,36 +44,6 @@
      ((equal? STR (car s)) #t)
      (else (loop (cdr s))))))
 
-; Deal with conditional inclusion of text via entities.
-(default
-  (let* ((role (attribute-string (normalize "role")))
-	 (for-arch (entity-text "arch")))
-    (cond
-
-     ;; If role=historic, and we're not printing historic things, then
-     ;; don't output this element.
-     ((and (equal? role "historic")
-          (not %include-historic%))
-      (empty-sosofo))
-
-     ;; None of the above
-     (else (next-match)))))
-
-(mode qandatoc
-  (default
-    (let* ((role (attribute-string (normalize "role")))
-	   (for-arch (entity-text "arch")))
-      (cond
-
-       ;; If role=historic, and we're not printing historic things, then
-       ;; don't output this element.
-       ((and (equal? role "historic")
-	     (not %include-historic%))
-	(empty-sosofo))
-
-       ;; None of the above
-       (else (next-match))))))
-
 ; We might have some sect1 level elements where the modification times
 ; are significant.  An example of this is the "What's New" section in
 ; the release notes.  We enable the printing of pubdate entry in
@@ -198,7 +158,6 @@
                  (u (string-append "&release.man.url;?query="
                          (data r) "&" "sektion=" (data m))))
             (case v
-              (("xfree86") (string-append u "&" "manpath=XFree86+&release.manpath.xfree86;" ))
               (("xorg")    (string-append u "&" "manpath=Xorg+&release.manpath.xorg;" ))
               (("netbsd")  (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;"))
               (("ports")   (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;"))
diff --git a/release/doc/share/sgml/release.ent b/release/doc/share/sgml/release.ent
index 03017d58994..c6a60dc465f 100644
--- a/release/doc/share/sgml/release.ent
+++ b/release/doc/share/sgml/release.ent
@@ -6,23 +6,23 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "8.0-CURRENT">
+<!ENTITY release.current "9.0-CURRENT">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
      branchpoint. -->
-<!ENTITY release.prev "7.0-RELEASE">
+<!ENTITY release.prev "8.0-RELEASE">
 
 <!-- The previous stable release, useful for pointing user's at the
      release they SHOULD be running if they don't want the bleeding
      edge. -->
-<!ENTITY release.prev.stable "7.0-RELEASE">
+<!ENTITY release.prev.stable "8.0-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "8.0-RELEASE">
+<!ENTITY release.next "9.0-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "8-CURRENT">
+<!ENTITY release.branch "9-CURRENT">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
 <!ENTITY release.url "http://www.FreeBSD.org/snapshots/">
@@ -36,11 +36,10 @@
 
 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
-<!ENTITY release.manpath.xfree86       "4.5.0">
-<!ENTITY release.manpath.xorg          "7.2">
-<!ENTITY release.manpath.netbsd        "3.0">
+<!ENTITY release.manpath.xorg          "7.4">
+<!ENTITY release.manpath.netbsd        "5.0.1">
 <!ENTITY release.manpath.freebsd-ports "Ports">
-<!ENTITY release.manpath.freebsd       "8-current">
+<!ENTITY release.manpath.freebsd       "9-current">
 
 <!-- Text constants which probably don't need to be changed.-->