===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/stable.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- www/stable.html	2016/11/20 15:45:38	1.55
+++ www/stable.html	2017/04/11 03:29:09	1.56
@@ -37,25 +37,40 @@
       merged.
 </ul>
 
+If you're running the -release branch of OpenBSD on amd64 or i386, you can
+simply use the <a href="http://man.openbsd.org/syspatch">syspatch(8)</a> utility
+to upgrade any files in need of
+<a href="faq/faq10.html#Patches">security or reliability fixes</a>.
+This page describes how to follow the -stable branch via CVS and building
+from source.
+
 <h3 id="getting">Getting <i>-stable</i> source code</h3>
 
+To obtain the <i>-stable</i> tree for OpenBSD 6.1, <b>it is recommended that you
+<a href="anoncvs.html#getting">check out</a> a fresh source tree</b> from an
+<a href="anoncvs.html">AnonCVS</a> server.
+If you need to <a href="anoncvs.html#updating">update</a> on top of a
+pre-existing source tree, you need to do
+<a href="https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/www/faq/current.html?rev=1.808&content-type=text/html#r20161014a">
+some cleanup</a> first.
+<!-- XXXrelease - remove paragraph above and reinstate paragraph below
 To obtain the <i>-stable</i> tree for a particular release of OpenBSD, you can
 <a href="anoncvs.html#updating">update</a> on top of a pre-existing source tree
 or you can <a href="anoncvs.html#getting">check out</a> a fresh source tree from
 an <a href="anoncvs.html">AnonCVS</a> server.
+-->
 
 <p>
 <!-- XXXrelease - bump href to upgradeXX.html -->
 Do not attempt to go from one release to another via source.
-Instead, please follow the <a href="faq/upgrade60.html">upgrade guide</a> for
+Instead, please follow the <a href="faq/upgrade61.html">upgrade guide</a> for
 the release before compiling <i>-stable</i>.
 
 <h3 id="building">Building OpenBSD <i>-stable</i></h3>
-<!-- XXXrelease - figure out a way to deal with build:wobj -->
 
 Details on building OpenBSD from source are provided in steps 2 and 3 of the
-<!-- XXXrelease - remove "OpenBSD-6.0/" from man link -->
-<a href="http://man.openbsd.org/OpenBSD-6.0/release">release(8)</a> manual.
+<!-- XXXrelease - bump man link -->
+<a href="http://man.openbsd.org/OpenBSD-6.1/release">release(8)</a> manual.
 There is also an FAQ on <a href="faq/faq5.html">building the system</a>.
 If you have a number of machines to keep on the <i>-stable</i> branch, you may
 wish to <a href="faq/faq5.html#Release">make a release</a>.
@@ -64,12 +79,11 @@
 
 Replace <tt>GENERIC</tt> with <tt>GENERIC.MP</tt> for multiprocessor systems.
 
-<!-- XXX release: interpolate 'make obj' -->
 <blockquote><pre>
 # <b>cd /sys/arch/$(machine)/conf</b>
 # <b>config GENERIC</b>
 # <b>cd /sys/arch/$(machine)/compile/GENERIC</b>
-# <b>make clean && make && make install</b>
+# <b>make clean && make obj && make && make install</b>
 # <b>reboot</b>
 </pre></blockquote>