diff --git a/doc/copyright.texi b/doc/copyright.texi
index 56be8e5eb..41dd3b6b2 100644
--- a/doc/copyright.texi
+++ b/doc/copyright.texi
@@ -14,6 +14,7 @@
 @comment  node-name,  next,  previous,  up
 @appendix Copyrights and Licenses
 
+@heading Kungliga Tekniska Högskolan
 
 @copyrightstart
 @verbatim
@@ -51,6 +52,11 @@ SUCH DAMAGE.
 
 @end verbatim
 @copynext
+
+@heading Massachusetts Institute of Technology
+
+The parts of the libtelnet that handle Kerberos.
+
 @verbatim
 
 Copyright (C) 1990 by the Massachusetts Institute of Technology
@@ -73,6 +79,12 @@ or implied warranty.
 
 @end verbatim
 @copynext
+
+@heading The Regents of the University of California
+
+The parts of the libroken, most of libtelnet, libeditline, telnet, ftp,
+and popper.
+
 @verbatim
 
 Copyright (c) 1988, 1990, 1993
@@ -107,6 +119,11 @@ SUCH DAMAGE.
 
 @end verbatim
 @copynext
+
+@heading Simmule Turner and Rich Salz
+
+libeditline
+
 @verbatim
 
 Copyright 1992 Simmule Turner and Rich Salz.  All rights reserved. 
@@ -133,6 +150,11 @@ to the following restrictions:
 
 @end verbatim
 @copynext
+
+@heading Michael J. Fromberger
+
+The RSA/DH support for libhcrypto.
+
 @verbatim
 
 IMath is Copyright 2002-2005 Michael J. Fromberger
@@ -159,6 +181,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 @end verbatim
 @copynext
+
+@heading Doug Rabson
+
+GSS-API mechglue layer.
+
 @verbatim
 
 Copyright (c) 2005 Doug Rabson
@@ -187,6 +214,50 @@ SUCH DAMAGE.
 
 @end verbatim
 @copynext
+
+@heading PADL Software Pty Ltd
+
+CFX implementation for GSS-API krb5 mech.
+
+@verbatim
+
+Copyright (c) 2003, PADL Software Pty Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of PADL Software nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY PADL SOFTWARE AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL PADL SOFTWARE OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+@end verbatim
+@copynext
+
+@heading Marko Kreen
+
+Fortuna in libhcrypto
+
 @verbatim
 
 Copyright (c) 2005 Marko Kreen
@@ -215,6 +286,11 @@ SUCH DAMAGE.
 
 @end verbatim
 @copynext
+
+@heading NTT (Nippon Telegraph and Telephone Corporation)
+
+Camellia in libhcrypto
+
 @verbatim
 
 Copyright (c) 2006,2007
@@ -243,6 +319,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 @end verbatim
 @copynext
+
+@heading The NetBSD Foundation, Inc.
+
+vis.c in libroken
+
 @verbatim
 
 Copyright (c) 1999, 2005 The NetBSD Foundation, Inc.
@@ -271,6 +352,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 @end verbatim
 @copynext
+
+@heading Vincent Rijmen, Antoon Bosselaers, Paulo Barreto
+
+AES in libhcrypto
+
 @verbatim
 
 rijndael-alg-fst.c
@@ -299,6 +385,11 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 @end verbatim
 @copynext
+
+@heading Richard Outerbridge
+
+DES core in libhcrypto
+
 @verbatim
 
 D3DES (V5.09) -