--- wikisrc/releng.mdwn	2013/03/16 21:18:18	1.2
+++ wikisrc/releng.mdwn	2018/03/15 14:02:00	1.21
@@ -1,27 +1,42 @@
+[[!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 8.0.  There are no dates associated with NetBSD 8.0 yet.
+
+Development for NetBSD 8.0 is still occurring on the trunk of the CVS tree.
+
+Please give a look to the [[NetBSD 8.0 pre-release tasklist|netbsd8]] for more
+information about the 8.0 pre-release tasklist.
+
 ## Active Major Releases
 
-### NetBSD 6.x
+### NetBSD 7.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.
-  + CVS branch tag: <code>netbsd-6</code>
+* Next minor release: NetBSD 7.2 (No release date proposed)
+  + CVS branch tag: <code>netbsd-7</code>
 * Actively supported teeny releases:
-  + [NetBSD 6.0.1](http://www.netbsd.org/releases/formal-6/NetBSD-6.0.1.html)
-    - CVS branch tag: <code>netbsd-6-0</code>
+  + [NetBSD 7.1.1](http://www.netbsd.org/releases/formal-7/NetBSD-7.1.1.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 7 open problem report summary](http://releng.NetBSD.org/pr-list.html)
 
-### NetBSD 5.x
+### NetBSD 6.x
 
-* Next Minor release: NetBSD 5.3 (No release date proposed)
-  + CVS branch tag: <code>netbsd-5</code>
+* Next minor release: NetBSD 6.2 (No release date proposed)
+  + CVS branch tag: <code>netbsd-6</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>
+  + [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)
 
 ## Automated Status Information
 
@@ -34,6 +49,6 @@ This page contains various information a
 
 ##  Release Engineer Documentation
 
-* [[Handling Pull-up requests|handling-pullups]]
+* [[Pull-up workflow and policies|workflow]]
 * [[Preparing for a release|release-prep]]
 * [[The Autobuild cluster|autobuild]]