--- wikisrc/releng.mdwn	2013/03/16 21:25:48	1.4
+++ wikisrc/releng.mdwn	2018/08/01 17:20:07	1.30
@@ -1,36 +1,47 @@
+[[!meta title="Release Engineering"]]
+
 # NetBSD Release Engineering
 
 This page contains various information about NetBSD Release Engineering, including status information about various branches, pointers to release engineering procedures and other documentation, and the status of various branches.
 
 ## Next Major Release
 
-The next major release will be NetBSD 7.0.  There are no dates associated with NetBSD 7.0 yet.
+The next major release will be NetBSD 9.0.
 
-Development for NetBSD 7.0 is still occurring on the trunk of the CVS tree.
+* Next release: NetBSD 9.0
+  + no CVS branch yet
+* [[NetBSD 9.0 preliminary task list|netbsd9]]
 
 ## Active Major Releases
 
+### NetBSD 8.x
+
+* Next minor release: NetBSD 8.1 (No release date proposed)
+  + CVS branch tag: <code>netbsd-8</code>
+* [Current pull-up queue for the netbsd-8 branch](http://releng.netbsd.org/cgi-bin/req-8.cgi)
+
+### NetBSD 7.x
+
+* Next minor release: NetBSD 7.2 (No release date proposed)
+  + CVS branch tag: <code>netbsd-7</code>
+* Actively supported teeny releases:
+  + [NetBSD 7.1.2](http://www.netbsd.org/releases/formal-7/NetBSD-7.1.2.html)
+    - CVS branch tag: <code>netbsd-7-1</code>
+  + [NetBSD 7.0.2](http://www.netbsd.org/releases/formal-7/NetBSD-7.0.2.html)
+    - CVS branch tag: <code>netbsd-7-0</code>
+* [Current pull-up queue for the netbsd-7 branch](http://releng.netbsd.org/cgi-bin/req-7.cgi)
+
 ### NetBSD 6.x
 
-* Next Minor release: NetBSD 6.1 (April 2013)
-  + [Release Candidate 1](http://blog.netbsd.org/tnf/entry/netbsd_6_1_release_candidate) for NetBSD 6.1 is out.  Release Candidate 2 will be out soon.
+* Next minor release: NetBSD 6.2 (No release date proposed)
   + CVS branch tag: <code>netbsd-6</code>
 * Actively supported teeny releases:
-  + [NetBSD 6.0.1](http://www.netbsd.org/releases/formal-6/NetBSD-6.0.1.html)
+  + [NetBSD 6.1.5](http://www.netbsd.org/releases/formal-6/NetBSD-6.1.5.html)
+    - CVS branch tag: <code>netbsd-6-1</code>
+  + [NetBSD 6.0.6](http://www.netbsd.org/releases/formal-6/NetBSD-6.0.6.html)
     - CVS branch tag: <code>netbsd-6-0</code>
 * [Current pull-up queue for the netbsd-6 branch](http://releng.netbsd.org/cgi-bin/req-6.cgi)
 
-### NetBSD 5.x
-
-* Next Minor release: NetBSD 5.3 (No release date proposed)
-  + CVS branch tag: <code>netbsd-5</code>
-* Actively supported teeny releases:
-  + [NetBSD 5.2](http://www.netbsd.org/releases/formal-5/NetBSD-5.2.html)
-    - CVS branch tag: <code>netbsd-5-2</code>
-  + [NetBSD 5.1.2](http://www.netbsd.org/releases/formal-5/NetBSD-5.1.2.html)
-    - CVS branch tag: <code>netbsd-5-1</code>
-* [Current pull-up queue for the netbsd-5 branch](http://releng.netbsd.org/cgi-bin/req-5.cgi)
-
 ## Automated Status Information
 
 * [Daily build snapshot status](http://releng.netbsd.org/cgi-bin/builds.cgi)
@@ -42,6 +53,6 @@ Development for NetBSD 7.0 is still occu
 
 ##  Release Engineer Documentation
 
-* [[Handling Pull-up requests|handling-pullups]]
-* [[Preparing for a release|release-prep]]
+* [[Pull-up workflow and policies|workflow]]
+* [[Long and mid-term releng chores|releng-todo]]
 * [[The Autobuild cluster|autobuild]]