diff --git a/en/news/1996/Makefile b/en/news/1996/Makefile
new file mode 100644
index 0000000000..c4dc790646
--- /dev/null
+++ b/en/news/1996/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD: www/en/news/Makefile,v 1.17 2000/03/09 21:00:25 jim Exp $
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+
+DOCS=	index.sgml
+
+INDEXLINK= ../news.html
+
+.include "../../web.mk"
diff --git a/en/news/1996/index.sgml b/en/news/1996/index.sgml
new file mode 100644
index 0000000000..5b35ed3c1e
--- /dev/null
+++ b/en/news/1996/index.sgml
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
+<!ENTITY base CDATA "..">
+<!ENTITY date "$FreeBSD: www/en/news/newsflash.sgml,v 1.139 1999/12/21 01:59:53 nik Exp $">
+<!ENTITY title "FreeBSD News flash! (1996)">
+<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY newshome '<a href="../news.html">News Home</a>'>
+<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
+]>
+<!-- $FreeBSD: www/en/news/newsflash.sgml,v 1.139 1999/12/21 01:59:53 nik Exp $ -->
+
+<html>
+    &header;
+
+    <h2>December 1996</h2>
+    
+    <ul>
+      <li>
+	<p><b>24-Dec-1996</b> FreeBSD <a
+	    href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2-BETA">2.2-BETA</a> has
+	  been released. Please see the <a
+	    href="ftp://ftp.FreeBSD.org/pub/FreeBSD/2.2-BETA/RELNOTES.TXT">
+	    Release Notes</a> for more information.</p></li>
+      
+      <li>
+	<p><b>13-Dec-1996</b> FreeBSD 2.2-RELEASE will not support
+	  installation on machines with less than 5MB of RAM or 1.2MB floppy
+	  drives. Please see the original <a
+	    href="../releases/2.2R/install-media.html">announcement</a> for
+	  more information.</p>
+      </li>
+    </ul>
+
+    <h2>November 1996</h2>
+    
+    <ul>
+      <li>
+	<p><b>15-Nov-1996</b> FreeBSD <a
+	    href="&base/releases/2.1.6R/security.html">2.1.6-RELEASE</a> is
+	  out.  Please see the <a
+	    href="&base/releases/2.1.6R/security.html">release notes</a> for
+	  more information.</p>
+	</li>
+
+      <li>
+	<p><b>4-Nov-1996</b> The FreeBSD <a
+	    href="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS</a> development
+	  tree has branched again.  <a href="../releases/">See here</a> for
+	  more information.</p>
+	</li>
+    </ul>
+
+      &newshome;
+      &footer;
+  </body>
+</html>
diff --git a/en/news/1997/Makefile b/en/news/1997/Makefile
new file mode 100644
index 0000000000..c4dc790646
--- /dev/null
+++ b/en/news/1997/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD: www/en/news/Makefile,v 1.17 2000/03/09 21:00:25 jim Exp $
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+
+DOCS=	index.sgml
+
+INDEXLINK= ../news.html
+
+.include "../../web.mk"
diff --git a/en/news/1997/index.sgml b/en/news/1997/index.sgml
new file mode 100644
index 0000000000..46c5f34908
--- /dev/null
+++ b/en/news/1997/index.sgml
@@ -0,0 +1,273 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
+<!ENTITY base CDATA "../..">
+<!ENTITY date "$FreeBSD: www/en/news/newsflash.sgml,v 1.139 1999/12/21 01:59:53 nik Exp $">
+<!ENTITY title "FreeBSD News flash! (1997)">
+<!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
+<!ENTITY newshome '<a href="../news.html">News Home</a>'>
+<!ENTITY % newsincludes SYSTEM "../includes.sgml"> %newsincludes;
+<!ENTITY ftp "ftp://ftp.FreeBSD.org/pub/FreeBSD">
+]>
+<!-- $FreeBSD: www/en/news/newsflash.sgml,v 1.139 1999/12/21 01:59:53 nik Exp $ -->
+
+<html>
+    &header;
+
+    <h2>December 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>26-Dec-97</b> A convenient front-end tool for installing and
+	  configuring the <a href="../handbook/synching.html#CVSUP">CVSup</a>
+	  utility is now available.  To use it, simply login or su to root and
+	  run: <tt><b>pkg_add</b> &ftp;/development/CVSup/cvsupit.tgz</tt></p>
+      </li>
+
+      <li>
+	<p><b>2-Dec-97</b> The "FOOF" bug has now been fixed in our
+	  3.0-current and 2.2-stable branches and can either be incorporated
+	  by using the <a href="../handbook/synching.html#CVSUP">CVSup</a>
+	  utility, as described below for the LAND attack fix, or by applying
+	  <a
+	    href="&ftp;/2.2.5-RELEASE/updates/f00f.diff.2.2">these
+	    patches</a>.</p>
+      </li>
+
+      <li>
+	<p><b>1-Dec-97</b> The "LAND attack" bug in TCP/IP has now been fixed
+	  in all relevant branches and can be incorporated by using the <a
+	    href="../handbook/synching.html#CVSUP">CVSup</a> utility to track
+	  the latest 2.2 or 3.0 sources.</p>
+      </li>
+
+      <li>
+	<p><b>1-Dec-97</b> Team FreeBSD is a group of FreeBSD users and
+	  supporters contributing CPU idle time in an effort to crack RSA's
+	  64-bit encryption code.  For more information, visit <a
+	    href="http://www.circle.net/team-freebsd/">Team FreeBSD's WWW
+	    site</a>.</p>
+      </li>
+    </ul>
+
+    <h2>November 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>21-Nov-97</b> <em>Pentium bug</em> -- We are aware of the "F00F"
+	  Pentium halting bug and are working with Intel on a fix. When we
+	  have a fix ready for public consumption it will be announced here,
+	  on the mailing list announce@FreeBSD.org and to the Usenet newsgroup
+	  <a
+	    href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>.  Your patience is appreciated.</p>
+      </li>
+
+      <li>
+	<p><b>09-Nov-97</b> FreeBSD 2.2.5-RELEASE CDROMS are now in stock and
+	  shipping to customers worldwide.  More information is available at
+	  <a
+	    href="http://www.cdrom.com/titles/os/fbsd25.htm">http://www.cdrom.com/titles/os/fbsd25.htm</a>.</p>
+      </li>
+    </ul>
+    
+    <h2>October 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>22-Oct-97</b> FreeBSD 2.2.5 has been released.  See the <a
+	    href="&base/releases/index.html">Release Information</a> page for
+	  details.  Also be sure to check the <a
+	    href="&ftp;/2.2.5-RELEASE/ERRATA.TXT"> release errata</a> after
+	  installation for any late-breaking issues with 2.2.5 that you should
+	  know about.</p>
+      </li>
+    </ul>
+
+    <h2>September 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>01-Sep-97</b> FreeBSD performed well in an Internet Week <a
+	    href="http://techweb.cmp.com/internetwk/reviews/rev0901.htm">review</a> of WWW server platforms.</p>
+      </li>
+    </ul>
+
+    <h2>August 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>11-Aug-97</b> Researchers in Duke University's <a
+	    href="http://www.cs.duke.edu/ari/index.html">Trapeze Project</a>
+	  have developed a high-speed Myrinet driver for FreeBSD.  More
+	  information about the driver, Trapeze Project, and its parent
+	  project, the Collaborative Cluster Computing Iniative, including the
+	  code for the Myrinet driver, are available from the CCCI's <a
+	    href="http://www.cs.duke.edu/ari/index.html">WWW page</a>.</p>
+      </li>
+      
+      <li>
+	<p><b>03-Aug-97</b> Netscape Communications has released a beta
+	  version of Netscape Communicator v4.0 for FreeBSD.  It can be
+	  obtained via FTP from <a
+	    href="ftp://ftp.netscape.com/pub/communicator/4.03/4.03b8/english/unix/freebsd/base_install/">ftp.netscape.com</a> or its mirrors.</p>
+      </li>
+    </ul>
+    
+
+    <h2>July 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>22-Jul-97</b> MacIP, an AppleTalk-to-IP gateway program for
+	  FreeBSD, is in beta testing.  To get the latest version, see <a
+	    href="http://www.promo.de/pub/people/stefan/netatalk/">http://www.promo.de/pub/people/stefan/netatalk/</a> or <a href="ftp://ftp.promo.de/pub/people/stefan/netatalk/">ftp://ftp.promo.de/pub/people/stefan/netatalk/</a>.</p>
+      </li>
+      
+      <li>
+	<p><b>17-Jul-97</b> The first issue of the FreeBSD Newsletter is now
+	  available in <a href="&ftp;/doc/newsletter/issue1.pdf">Adobe PDF
+	    format</a> (also by <a
+	  href="&ftp;/doc/newsletter/issue1.pdf">FTP</a>).  A <a
+	    href="&ftp;/doc/newsletter/README.TXT">help file</a> is available
+	  to assist you in selecting and using a PDF viewer.  Article
+	  submissions, advertisements, and letters to the editor should be
+	  sent to <a
+	    href="mailto:newsletter@FreeBSD.org">newsletter@FreeBSD.org</a>.</p>
+      </li>
+    </ul>
+
+    <h2>June 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>17-Jun-97</b> FreeBSD <a
+	    href="&ftp;/2.2.2-RELEASE/">2.2.2-RELEASE</a> CD-ROM discs are now
+	  in stock; subscription customers should receive them shortly.</p>
+      </li>
+    </ul>
+    
+    <h2>May 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>16-May-97</b> FreeBSD <a
+	    href="&ftp;/2.2.2-RELEASE/">2.2.2-RELEASE</a> has been released.
+	  The <a href="&ftp;/2.2.2-RELEASE/RELNOTES.TXT">Release Notes</a> and
+	  <a href="&ftp;/FreeBSD2.2.2-RELEASE/ERRATA.TXT">Errata List</a> can
+	  provide more information.</p>
+      </li>
+
+      <li>
+	<p><b>12-May-97</b> A 3.0-Current SNAP-of-the-day server has been
+	  established at <a
+	    href="ftp://current.FreeBSD.org/pub/FreeBSD/">ftp://current.FreeBSD.org/pub/FreeBSD/</a>.
+	  A 3.0-SNAPshot will be generated daily, and old SNAPshots will be
+	  kept for a minimum of one week.</p>
+      </li>
+    </ul>
+    
+    <h2>April 1997</h2>
+
+    <ul>
+      <li><p><b>28-Apr-97</b> The 3.0-current src tree now contains support
+	  for building Symmetric MultiProcessor kernels.  For details go to
+	  the <a href="http://www.FreeBSD.org/~fsmp/SMP/SMP.html">SMP</a>
+	  page.
+	</p>
+      </li>
+
+      <li><p><b>22-Apr-97</b> A RELENG_2.2 snap-of-the-day server has been
+	  established at <a
+	    href="ftp://releng22.FreeBSD.org/pub/FreeBSD/">ftp://releng22.FreeBSD.org/pub/FreeBSD</a>.
+	  The <a
+	    href="ftp://releng22.FreeBSD.org/pub/FreeBSD/README.TXT">README.TXT</a> has more information.</p>
+      </li>
+
+      <li>
+	<p><b>15-Apr-97</b> FreeBSD 2.2.1-RELEASE CDs are shipping.  Please
+	  see <a
+	    href="http://www.cdrom.com/titles/os/fbsd22.htm">http://www.cdrom.com/titles/os/fbsd22.htm</a> for more information.</p>
+      </li>
+    </ul>
+
+    <h2>March 1997</h2>
+
+    <ul>
+      <li><p><b>28-Mar-97</b> Sony Computer Science Laboratory, Inc. has
+	  released an alpha version of ALTQ/CBQ, an alternative queuing
+	  framework for BSD Unix. <a
+	    href="http://www.csl.sony.co.jp/person/kjc/programs.html">More
+	    information</a> and the <a
+	    href="ftp://ftp.csl.sony.co.jp/pub/kjc/altq.tar.gz">source
+	    code</a> is available.</p>
+      </li>
+	
+      <li>
+	<p><b>25-Mar-97</b> <a href="&ftp;/2.2.1-RELEASE/">FreeBSD
+	    2.2.1-RELEASE</a> is now available, replacing 2.2-RELEASE.  Read
+	  the <a href="&ftp;/2.2.1-RELEASE/README.TXT">README.TXT</a> file or
+	  the <a href="&base/releases/2.2.1R/notes.html">Release Notes</a>
+	  for more information.</p>
+      </li>
+
+      <li>
+	<p><b>16-Mar-97</b> <a href="&ftp;/2.2-RELEASE/">FreeBSD
+	    2.2-RELEASE</a> is now available.  Read the <a
+	    href="&ftp;/2.2-RELEASE/README.TXT">README.TXT</a> file or the <a
+	    href="&base/releases/2.2R/notes.html">Release Notes</a> 	for
+	  more information.</p>
+      </li>
+    </ul>
+
+    <h2>February 1997</h2>
+    
+    <ul>
+      <li>
+	<p><b>20-Feb-1997</b> FreeBSD 2.1.7-RELEASE is now available. Read the
+	  README.TXT file or the <a href="&base/releases/2.1.7R/notes.html">
+	    Release Notes</a> for more information.</p>
+      </li>
+
+      <li>
+	<p><b>10-Feb-1997</b> FreeBSD 3.0-970209-SNAP has been released. Read
+	  the README.TXT file for more information about this
+	  release.</p>
+      </li>
+      
+      <li>
+	<p><b>06-Feb-1997</b> A serious security problem affecting FreeBSD
+	  2.1.6 and earlier systems was found.  The problem has been corrected
+	  within the -stable, -current, and RELENG_2_2 source trees.  As an
+	  additional precaution, FreeBSD 2.1.6 is no longer available from the
+	  FTP distribution sites.  You can read more about the problem and
+	  solution from the <a
+	    href="&ftp;/CERT/advisories/FreeBSD-SA-97:01.setlocale">FreeBSD-SA-97:01.setlocale</a> security announcement.</p>
+      </li>
+      
+      <li>
+	<p><b>06-Feb-1997</b> The final pre-release version of FreeBSD
+	  2.2-GAMMA, is now available. The README.TXT file has more
+	  information.</p>
+      </li>
+
+      <li>
+	<p><b>02-Feb-1997</b> A snap-of-the-day server has been set up for the
+	  most current <A HREF="../releases/snapshots.html">snapshot</a>
+	  release of FreeBSD 2.2.  Read the <A
+	    HREF="ftp://22gamma.FreeBSD.org/pub/FreeBSD/README.TXT">README.TXT</A> file for more information.</p>
+      </li>
+    </ul>
+
+    <h2>January 1997</h2>
+
+    <ul>
+      <li>
+	<p><b>25-Jan-1997</b> FreeBSD <A HREF="&ftp;/3.0-970124-SNAP/">
+	    3.0-970124-SNAP</A> has been released.  Please see the <a
+	    href="&ftp;/3.0-970124-SNAP/RELNOTES.TXT"> Release Notes</a> for
+	  more information.</p>
+      </li>
+    </ul>
+    
+      &newshome;
+      &footer;
+  </body>
+</html>
diff --git a/en/news/Makefile b/en/news/Makefile
index 0809cd3c1b..6ee4623cda 100644
--- a/en/news/Makefile
+++ b/en/news/Makefile
@@ -1,40 +1,42 @@
-# $FreeBSD: www/en/news/Makefile,v 1.16 1999/09/06 07:02:46 peter Exp $
+# $FreeBSD: www/en/news/Makefile,v 1.17 2000/03/09 21:00:25 jim Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 
 .if exists("../Makefile.conf")
 .include "../Makefile.conf"
 .endif
 
 # quick news letter
 DOCS=	qnewsletter.sgml
 DOCS+=	qnewsletter-1-1.sgml
 DOCS+=	qnewsletter-1-2.sgml
 DOCS+=	qnewsletter-1-3.sgml
 DOCS+=	qnewsletter-1-4.sgml
 DOCS+=	qnewsletter-1-5.sgml
 DOCS+=	qnewsletter-1-6.sgml
 DOCS+=	qnewsletter-1-7.sgml
 DOCS+=	qnewsletter-2-1.sgml
 DOCS+=	qnewsletter-2-2.sgml
 
 DOCS+= press.sgml
 DOCS+= newsflash.sgml
 DOCS+= news.sgml
 DOCS+= webchanges.sgml
 
 # press releases
 DOCS+= pressreleases.sgml
 DOCS+= press-rel-1.sgml
 DOCS+= press-rel-2.sgml
 DOCS+= press-rel-3.sgml
 DOCS+= press-rel-4.sgml
 
 # The yearly State of the Union address
 DOCS+= sou1999.sgml
 
 INDEXLINK= news.html
 
+SUBDIR= 	1996
+SUBDIR+= 	1997
 .include "../web.mk"
