--- a/doc/programming.html
+++ b/doc/programming.html
@@ -4,18 +4,18 @@
 
 
 <h1><font color=#000070>
-Programming with Xiphophorus <tt>libvorbis</tt>
+Programming with Xiph.org <tt>libvorbis</tt>
 </font></h1>
 
 <em>Last update to this document: July 22, 1999</em><br> 
 
 <h2>Description</h2> 
 
-Libvorbis is Xiphophorus's portable Ogg Vorbis CODEC implemented as a
-programmatic library.  Libvorbis provides primitives to handle framing
-and manipulation of Ogg bitstreams (used by the Vorbis for
-streaming), a full analysis (encoding) interface as well as packet
-decoding and synthesis for playback. <p>
+Libvorbis is the Xiph.org Foundation's portable Ogg Vorbis CODEC
+implemented as a programmatic library.  Libvorbis provides primitives
+to handle framing and manipulation of Ogg bitstreams (used by the
+Vorbis for streaming), a full analysis (encoding) interface as well as
+packet decoding and synthesis for playback. <p>
 
 The libvorbis library does not provide any system interface; a
 full-featured demonstration player included with the library
@@ -476,32 +476,27 @@
 </a>
 <font size=-2 color=#505050>
 
-Ogg is a <a href="http://www.xiph.org">Xiphophorus</a> effort to
+Ogg is a <a href="http://www.xiph.org"></a> effort to
 protect essential tenets of Internet multimedia from corporate
 hostage-taking; Open Source is the net's greatest tool to keep
 everyone honest. See <a href="http://www.xiph.org/about.html">About
-Xiphophorus</a> for details.
+</a> for details.
 <p>
 
-Ogg Vorbis is the first Ogg audio CODEC.  Anyone may
-freely use and distribute the Ogg and Vorbis specification,
-whether in a private, public or corporate capacity.  However,
-Xiphophorus and the Ogg project (xiph.org) reserve the right to set
-the Ogg/Vorbis specification and certify specification compliance.<p>
-
-Xiphophorus's Vorbis software CODEC implementation is distributed
-under the Lesser/Library GNU Public License.  This does not restrict
-third parties from distributing independent implementations of Vorbis
-software under other licenses.<p>
-
-OggSquish, Vorbis, Xiphophorus and their logos are trademarks (tm) of
-<a href="http://www.xiph.org/">Xiphophorus</a>.  These pages are
-copyright (C) 1994-2000 Xiphophorus. All rights reserved.<p>
+Ogg Vorbis is the first Ogg audio CODEC.  Anyone may freely use and
+distribute the Ogg and Vorbis specification, whether in a private,
+public or corporate capacity.  However, the Xiph.org Foundation and
+the Ogg project (xiph.org) reserve the right to set the Ogg Vorbis
+specification and certify specification compliance.<p>
+
+Xiph.org's Vorbis software CODEC implementation is distributed under a
+BSD-like license.  This does not restrict third parties from
+distributing independent implementations of Vorbis software under
+other licenses.<p>
+
+Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm)
+of the <a href="http://www.xiph.org/">Xiph.org Foundation</a>.  These
+pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights
+reserved.<p>
 
 </body>
-
-
-
-
-
-