commit-inetutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU Inetutils branch, master, updated. release_1_5-217-g9640d7f


From: Alfred M. Szmidt
Subject: [SCM] GNU Inetutils branch, master, updated. release_1_5-217-g9640d7f
Date: Tue, 03 Nov 2009 18:18:59 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=9640d7fca3ddf00e8d7bab9eb7cf36fcc3570678

The branch, master has been updated
       via  9640d7fca3ddf00e8d7bab9eb7cf36fcc3570678 (commit)
       via  0d90e77183b07ba34acd3a2c3cbc11874e180a18 (commit)
       via  5115582bbdcd12139a822d6e673d9108ab58c383 (commit)
       via  8481c26150a0dfab7a94011206caf7508d4d690a (commit)
       via  cf97d42baff1ae1d363c356ba3d77ad5b61f3d9e (commit)
       via  3876c01182637c08f5a6fab468d9b5795941fdf5 (commit)
       via  6f6baee264cfe98e001f549ac849a9584795d8c6 (commit)
       via  988cc480b9971aae65041c60c845d61639bad536 (commit)
       via  062055dd6d84fc9b1aed6aada7a91a2002c92277 (commit)
       via  0ae726abd881d32991638fddfcc6504f8c6448e9 (commit)
       via  97b5e979b994505d6d763398dfe9076512101196 (commit)
       via  8563a04321ddf56b4ee593cf671eb778777b0bde (commit)
       via  98b2e84e9cac131dc62663b34665fb55be65fc61 (commit)
       via  65c92e0bdbab3fbc3e66e5ab7e170808591bfb7d (commit)
       via  907d379e650f1096b6b09da25799982028fe8c58 (commit)
       via  c8cec47bc910acec7b8ed3c0ada372d56fefa3f6 (commit)
       via  bf37ef653c59213bbcd95aafbdc74a60d46d5fb9 (commit)
       via  2dc5f81e95e69145be0d88d4274a15ed872f85af (commit)
       via  51f068c64d64866f3b178f1c36f3a113259b3902 (commit)
       via  cd839cfe5e429bc77c686047cfceb05af82a6618 (commit)
       via  a79c62bdc3eb2bbd08b483f214d34afb89701456 (commit)
       via  37ad330b67bc86003cafcd5bc8846836e4b92ebd (commit)
      from  d4157abcfb08634a968c98a874c9d895f7cf2681 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9640d7fca3ddf00e8d7bab9eb7cf36fcc3570678
Author: Alfred M. Szmidt <address@hidden>
Date:   Tue Nov 3 19:23:33 2009 +0100

    Remove trailing whitespaces.  (silent change)

commit 0d90e77183b07ba34acd3a2c3cbc11874e180a18
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 23:41:14 2009 +0100

    hostname/hostname.c (argp_options): Fixed typo.

commit 5115582bbdcd12139a822d6e673d9108ab58c383
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 23:35:55 2009 +0100

    Updated.  (silent change, generated files from gnulib-import)

commit 8481c26150a0dfab7a94011206caf7508d4d690a
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 23:35:02 2009 +0100

    rlogind/rlogind.c, telnetd/pty.c: Include <pty.h>.

commit cf97d42baff1ae1d363c356ba3d77ad5b61f3d9e
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 23:33:58 2009 +0100

    rexecd/rexecd.c (doit): Added forward declaration.

commit 3876c01182637c08f5a6fab468d9b5795941fdf5
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 23:33:03 2009 +0100

    Ignore TAGS files.

commit 6f6baee264cfe98e001f549ac849a9584795d8c6
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 23:21:51 2009 +0100

    Don't use obsolete getopt module from gnulib.

commit 988cc480b9971aae65041c60c845d61639bad536
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 23:19:18 2009 +0100

    Updated.  (silent change)

commit 062055dd6d84fc9b1aed6aada7a91a2002c92277
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 23:03:23 2009 +0100

    Added copyright notice.  (silent change)

commit 0ae726abd881d32991638fddfcc6504f8c6448e9
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 22:15:41 2009 +0100

    Updated copyright notice.  (silent change)

commit 97b5e979b994505d6d763398dfe9076512101196
Author: Alfred M. Szmidt <address@hidden>
Date:   Thu Oct 29 09:55:43 2009 +0100

    Removed spurious tabs/spaces.  (silent change)

commit 8563a04321ddf56b4ee593cf671eb778777b0bde
Author: Alfred M. Szmidt <address@hidden>
Date:   Tue Oct 27 08:41:06 2009 +0100

    Updated.  (silent change)

commit 98b2e84e9cac131dc62663b34665fb55be65fc61
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Oct 26 21:38:32 2009 +0100

    Removed erronous tabs/spaces.

commit 65c92e0bdbab3fbc3e66e5ab7e170808591bfb7d
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Oct 26 21:36:26 2009 +0100

    Removed obsolete BSD 4.2 code.

commit 907d379e650f1096b6b09da25799982028fe8c58
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Oct 26 21:15:03 2009 +0100

    Merge traceroute/traceroute.h into traceroute/traceroute.c.

commit c8cec47bc910acec7b8ed3c0ada372d56fefa3f6
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Oct 26 21:08:53 2009 +0100

    Merged rcp into a single file.

commit bf37ef653c59213bbcd95aafbdc74a60d46d5fb9
Author: Alfred M. Szmidt <address@hidden>
Date:   Mon Oct 26 20:57:12 2009 +0100

    Moved FSF copyright notice to the top.  (silent change)

commit 2dc5f81e95e69145be0d88d4274a15ed872f85af
Author: Alfred M. Szmidt <address@hidden>
Date:   Fri Oct 23 09:47:00 2009 +0200

    Removed stale README files.

commit 51f068c64d64866f3b178f1c36f3a113259b3902
Author: Alfred M. Szmidt <address@hidden>
Date:   Fri Oct 23 09:44:45 2009 +0200

    Updated TODO.

commit cd839cfe5e429bc77c686047cfceb05af82a6618
Author: Alfred M. Szmidt <address@hidden>
Date:   Fri Oct 23 09:34:52 2009 +0200

    Renamed `gwhois' to `whois'.

commit a79c62bdc3eb2bbd08b483f214d34afb89701456
Author: Alfred M. Szmidt <address@hidden>
Date:   Fri Oct 23 09:07:48 2009 +0200

    .gitignore (ChangeLog): Removed from list.

commit 37ad330b67bc86003cafcd5bc8846836e4b92ebd
Author: Alfred M. Szmidt <address@hidden>
Date:   Fri Oct 23 09:07:16 2009 +0200

    rexec/.gitignore: New file.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                         |    2 +-
 ChangeLog                          |  126 +++++++++++++++++++++++-
 ChangeLog.0                        |  170 ++++++++++++++++----------------
 Makefile.am                        |   25 +++---
 NEWS                               |    7 +-
 README-alpha                       |   26 +++---
 TODO                               |   58 +++++++++++
 am/check_macro.m4                  |   29 +++---
 am/check_member.m4                 |   26 +++---
 am/check_weak_refs.m4              |   26 +++---
 am/config_paths.m4                 |   30 +++---
 am/enable.m4                       |   28 +++---
 am/flushleft.m4                    |   26 +++---
 am/krb5.m4                         |   26 +++---
 am/libcurses.m4                    |   28 +++---
 am/result.m4                       |   26 +++---
 bootstrap.conf                     |   33 +++---
 configure.ac                       |   29 +++---
 doc/.gitignore                     |    2 +-
 doc/Makefile.am                    |   23 +++--
 doc/inetutils.texi                 |    4 +-
 ftp/Makefile.am                    |   23 +++--
 ftp/cmds.c                         |   41 ++++----
 ftp/cmdtab.c                       |   21 ++++-
 ftp/domacro.c                      |   21 ++++-
 ftp/extern.h                       |   29 +++++-
 ftp/ftp.c                          |   41 ++++----
 ftp/ftp_var.h                      |   43 ++++-----
 ftp/main.c                         |   41 ++++----
 ftp/ruserpass.c                    |   42 ++++----
 ftpd/Makefile.am                   |   23 +++--
 ftpd/README.sec                    |   32 ------
 ftpd/auth.c                        |   19 ++++
 ftpd/conf.c                        |   19 ++++
 ftpd/extern.h                      |   46 ++++-----
 ftpd/ftpcmd.y                      |    4 +-
 ftpd/ftpd.c                        |   42 ++++----
 ftpd/logwtmp.c                     |   43 +++-----
 ftpd/pam.c                         |   19 ++++
 ftpd/popen.c                       |   47 +++++-----
 ftpd/server_mode.c                 |   19 ++++
 gwhois/README                      |   31 ------
 gwhois/TODO                        |    9 --
 headers/Makefile.am                |   23 +++--
 headers/shishi_def.h               |   28 +++---
 headers/tftpsubs.h                 |   23 ++++-
 hostname/Makefile.am               |   22 ++--
 hostname/hostname.c                |   33 +++---
 ifconfig/Makefile.am               |   23 +++--
 ifconfig/TODO                      |   26 -----
 ifconfig/changeif.c                |   29 +++---
 ifconfig/flags.c                   |   29 +++---
 ifconfig/flags.h                   |   31 +++---
 ifconfig/if_index.c                |   35 ++++---
 ifconfig/if_index.h                |   28 +++---
 ifconfig/ifconfig.c                |   28 +++---
 ifconfig/ifconfig.h                |   30 +++---
 ifconfig/options.c                 |   28 +++---
 ifconfig/options.h                 |   30 +++---
 ifconfig/printif.c                 |   28 +++---
 ifconfig/printif.h                 |   30 +++---
 ifconfig/system.c                  |   19 ++++
 ifconfig/system.h                  |   30 +++---
 ifconfig/system/Makefile.am        |   23 +++--
 ifconfig/system/generic.c          |   29 +++---
 ifconfig/system/generic.h          |   32 +++---
 ifconfig/system/hpux.c             |   29 +++---
 ifconfig/system/hpux.h             |   31 +++---
 ifconfig/system/linux.c            |   29 +++---
 ifconfig/system/linux.h            |   31 +++---
 ifconfig/system/osf.c              |   31 +++---
 ifconfig/system/osf.h              |   31 +++---
 ifconfig/system/qnx.c              |   31 +++---
 ifconfig/system/qnx.h              |   31 +++---
 ifconfig/system/solaris.c          |   29 +++---
 ifconfig/system/solaris.h          |   31 +++---
 inetd/Makefile.am                  |   23 +++--
 inetd/inetd.c                      |   36 ++++----
 lib/.gitignore                     |   11 ++-
 lib/Makefile.am                    |   36 ++++----
 libicmp/Makefile.am                |   23 +++--
 libicmp/TODO                       |    1 -
 libicmp/icmp.h                     |   28 +++---
 libicmp/icmp_address.c             |   28 +++---
 libicmp/icmp_cksum.c               |   28 +++---
 libicmp/icmp_echo.c                |   28 +++---
 libicmp/icmp_timestamp.c           |   28 +++---
 libinetutils/Makefile.am           |   23 +++--
 libinetutils/argcv.c               |   26 +++---
 libinetutils/argcv.h               |   34 ++++---
 libinetutils/cleansess.c           |   29 +++---
 libinetutils/daemon.c              |   23 ++++-
 libinetutils/defauthors.c          |   26 +++---
 libinetutils/des_rw.c              |   23 ++++-
 libinetutils/kcmd.c                |   21 ++++-
 libinetutils/krcmd.c               |   21 ++++-
 libinetutils/libinetutils.h        |   34 +++---
 libinetutils/localhost.c           |   29 +++---
 libinetutils/logwtmp.c             |   29 +++---
 libinetutils/logwtmpko.c           |   19 ++++
 libinetutils/setsig.c              |   29 +++---
 libinetutils/shishi.c              |   26 +++---
 libinetutils/tftpsubs.c            |   21 ++++-
 libinetutils/ttymsg.c              |   21 ++++-
 libinetutils/utmp_init.c           |   59 ++++++++----
 libinetutils/utmp_logout.c         |   59 ++++++++----
 libls/Makefile.am                  |   23 +++--
 libls/cmp.c                        |   28 ++++-
 libls/extern.h                     |   26 ++++-
 libls/fts.c                        |   47 ++++-----
 libls/fts.h                        |   27 ++++--
 libls/ls.c                         |   46 ++++-----
 libls/ls.h                         |   30 ++++--
 libls/print.c                      |   46 ++++-----
 libls/stat_flags.c                 |   24 ++++-
 libls/util.c                       |   28 ++++-
 libtelnet/Makefile.am              |   23 +++--
 libtelnet/auth-proto.h             |   22 ++---
 libtelnet/auth.c                   |   21 ++--
 libtelnet/auth.h                   |   22 ++---
 libtelnet/enc-proto.h              |   22 ++---
 libtelnet/enc_des.c                |   21 ++--
 libtelnet/encrypt.c                |   21 ++--
 libtelnet/encrypt.h                |   22 ++---
 libtelnet/forward.c                |   20 ++--
 libtelnet/genget.c                 |   21 ++--
 libtelnet/genget.h                 |   18 ++++
 libtelnet/getent.c                 |   21 ++--
 libtelnet/kerberos.c               |   21 ++--
 libtelnet/kerberos5.c              |   16 ++--
 libtelnet/key-proto.h              |   22 ++---
 libtelnet/misc-proto.h             |   22 ++---
 libtelnet/misc.c                   |   20 ++--
 libtelnet/misc.h                   |   22 ++---
 libtelnet/read_passwd.c            |   20 ++--
 libtelnet/shishi.c                 |   16 ++--
 logger/Makefile.am                 |   23 +++--
 logger/logger.c                    |   27 +++---
 paths                              |   25 +++---
 ping/Makefile.am                   |   23 +++--
 ping/README.sec                    |   38 -------
 ping/TODO                          |    2 -
 ping/libping.c                     |   27 +++---
 ping/ping.c                        |   29 +++---
 ping/ping.h                        |   27 +++---
 ping/ping6.c                       |   29 +++---
 ping/ping6.h                       |   28 +++---
 ping/ping_address.c                |   28 +++---
 ping/ping_common.c                 |   29 +++---
 ping/ping_common.h                 |   28 +++---
 ping/ping_echo.c                   |   28 +++---
 ping/ping_impl.h                   |   29 +++---
 ping/ping_router.c                 |   28 +++---
 ping/ping_timestamp.c              |   28 +++---
 rcp/Makefile.am                    |   27 +++---
 rcp/extern.h                       |   47 ---------
 rcp/rcp.c                          |  175 +++++++++++++++++++++++++++++----
 rcp/util.c                         |  191 ------------------------------------
 rexec/.gitignore                   |    1 +
 rexec/Makefile.am                  |   22 ++--
 rexec/rexec.c                      |   19 ++--
 rexecd/Makefile.am                 |   23 +++--
 rexecd/rexecd.c                    |   33 +++---
 rlogin/Makefile.am                 |   23 +++--
 rlogin/rlogin.c                    |   41 ++++----
 rlogind/Makefile.am                |   23 +++--
 rlogind/rlogind.c                  |   31 +++---
 rsh/Makefile.am                    |   23 +++--
 rsh/rsh.c                          |   43 ++++----
 rshd/Makefile.am                   |   23 +++--
 rshd/rshd.c                        |   44 ++++----
 syslogd/Makefile.am                |   23 +++--
 syslogd/README.sec                 |   26 -----
 syslogd/syslogd.c                  |   59 +++++------
 talk/Makefile.am                   |   23 +++--
 talk/ctl.c                         |   41 ++++----
 talk/ctl_transact.c                |   41 ++++----
 talk/display.c                     |   41 ++++----
 talk/get_addrs.c                   |   41 ++++----
 talk/get_names.c                   |   41 ++++----
 talk/init_disp.c                   |   41 ++++----
 talk/invite.c                      |   41 ++++----
 talk/io.c                          |   41 ++++----
 talk/look_up.c                     |   41 ++++----
 talk/msgs.c                        |   41 ++++----
 talk/talk.c                        |   41 ++++----
 talk/talk.h                        |   43 ++++-----
 talk/talk_ctl.h                    |   43 ++++-----
 talkd/Makefile.am                  |   23 +++--
 talkd/README.sec                   |   27 -----
 talkd/acl.c                        |   28 +++---
 talkd/announce.c                   |   29 +++---
 talkd/intalkd.h                    |   28 +++---
 talkd/print.c                      |   28 +++---
 talkd/process.c                    |   28 +++---
 talkd/table.c                      |   28 +++---
 talkd/talkd.c                      |   28 +++---
 telnet/Makefile.am                 |   23 +++--
 telnet/README.sec                  |   31 ------
 telnet/authenc.c                   |   23 ++++-
 telnet/commands.c                  |   41 ++++----
 telnet/defines.h                   |   23 ++++-
 telnet/externs.h                   |   43 ++++-----
 telnet/fdset.h                     |   23 ++++-
 telnet/general.h                   |   23 ++++-
 telnet/krb4-proto.h                |   19 ++++
 telnet/main.c                      |   38 ++++----
 telnet/network.c                   |   21 ++++-
 telnet/ring.c                      |   21 ++++-
 telnet/ring.h                      |   44 ++++-----
 telnet/sys_bsd.c                   |   21 ++++-
 telnet/telnet.c                    |   41 ++++----
 telnet/terminal.c                  |   21 ++++-
 telnet/tn3270.c                    |   21 ++++-
 telnet/types.h                     |   23 ++++-
 telnet/utilities.c                 |   41 ++++----
 telnetd/Makefile.am                |   23 +++--
 telnetd/README.sec                 |   11 --
 telnetd/pty.c                      |   29 +++---
 telnetd/slc.c                      |   22 ++++-
 telnetd/state.c                    |   24 ++++-
 telnetd/telnetd.c                  |   30 +++---
 telnetd/telnetd.h                  |   28 +++---
 telnetd/term.c                     |   28 +++---
 telnetd/termstat.c                 |   22 ++++-
 telnetd/utility.c                  |   29 +++---
 tests/Makefile.am                  |   22 ++--
 tests/localhost.c                  |   27 +++---
 tftp/Makefile.am                   |   23 +++--
 tftp/extern.h                      |   23 ++++-
 tftp/main.c                        |   21 ++++-
 tftp/tftp.c                        |   21 ++++-
 tftpd/Makefile.am                  |   23 +++--
 tftpd/tftpd.c                      |   38 ++++----
 traceroute/Makefile.am             |   24 ++---
 traceroute/traceroute.c            |   74 +++++++++-----
 traceroute/traceroute.h            |   57 -----------
 uucpd/Makefile.am                  |   23 +++--
 uucpd/uucpd.c                      |  138 +++++---------------------
 {gwhois => whois}/.gitignore       |    0
 {gwhois => whois}/Makefile.am      |   23 +++--
 {gwhois => whois}/as_del_list      |    0
 {gwhois => whois}/data.h           |   18 ++++
 {gwhois => whois}/ip_del_list      |    0
 {gwhois => whois}/make_as_del.pl   |    1 -
 {gwhois => whois}/make_ip_del.pl   |    1 -
 {gwhois => whois}/make_tld_serv.pl |    1 -
 {gwhois => whois}/tld_serv_list    |    0
 {gwhois => whois}/whois.c          |   51 +++++-----
 {gwhois => whois}/whois.h          |   19 ++++
 250 files changed, 3978 insertions(+), 3523 deletions(-)
 delete mode 100644 ftpd/README.sec
 delete mode 100644 gwhois/README
 delete mode 100644 gwhois/TODO
 delete mode 100644 ifconfig/TODO
 delete mode 100644 libicmp/TODO
 delete mode 100644 ping/README.sec
 delete mode 100644 ping/TODO
 delete mode 100644 rcp/extern.h
 delete mode 100644 rcp/util.c
 create mode 100644 rexec/.gitignore
 delete mode 100644 syslogd/README.sec
 delete mode 100644 talkd/README.sec
 delete mode 100644 telnet/README.sec
 delete mode 100644 telnetd/README.sec
 delete mode 100644 traceroute/traceroute.h
 rename {gwhois => whois}/.gitignore (100%)
 rename {gwhois => whois}/Makefile.am (66%)
 rename {gwhois => whois}/as_del_list (100%)
 rename {gwhois => whois}/data.h (75%)
 rename {gwhois => whois}/ip_del_list (100%)
 rename {gwhois => whois}/make_as_del.pl (99%)
 rename {gwhois => whois}/make_ip_del.pl (99%)
 rename {gwhois => whois}/make_tld_serv.pl (99%)
 rename {gwhois => whois}/tld_serv_list (100%)
 rename {gwhois => whois}/whois.c (95%)
 rename {gwhois => whois}/whois.h (67%)

diff --git a/.gitignore b/.gitignore
index 75a29ed..81fd269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,12 +5,12 @@
 *.o
 *.so
 *~
+TAGS
 .bootstrap
 .deps
 .emacs*
 .libs
 ABOUT-NLS
-ChangeLog
 INSTALL
 Makefile
 Makefile.in
diff --git a/ChangeLog b/ChangeLog
index f89de16..27ab872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,123 @@
+2009-10-29  Alfred M. Szmidt  <address@hidden>
+
+       * hostname/hostname.c (argp_options): Fixed typo.
+
+2009-10-29  Alfred M. Szmidt  <address@hidden>
+
+       * rlogind/rlogind.c, telnetd/pty.c: Include <pty.h>.
+
+2009-10-29  Alfred M. Szmidt  <address@hidden>
+
+       * rexecd/rexecd.c (doit): Added forward declaration.
+
+2009-10-29  Alfred M. Szmidt  <address@hidden>
+
+       * .gitignore (TAGS): Added to list.
+
+2009-10-29  Alfred M. Szmidt  <address@hidden>
+
+       * bootstrap.conf (gnulib_modules): Use `getopt-gnu' instead of
+       `getopt'.
+
+2009-10-26  Alfred M. Szmidt  <address@hidden>
+
+       * uucpd/uucpd.c [BSD4_2]: Removed obsolete code.
+       (main) [BSDINETD]: Likewise.
+       (doit) [BSD4_2]: Likewise.
+       (usage_str): Variable removed.
+       (usage): Function removed.
+
+2009-10-26  Alfred M. Szmidt  <address@hidden>
+
+       * traceroute/traceroute.c: Don't include "traceroute.h".
+       (TRACE_UDP_PORT, TRACE_TTL): New macros.
+       (TRACE_UDP, TRACE_ICMP, TRACE_1393): New enums.
+       (trace): New struct.
+       (trace_init, trace_inc_ttl, trace_inc_port, trace_port)
+       (trace_read, trace_write, trace_udp_sock, trace_icmp_sock): Added
+       forward declarations.
+       * traceroute/traceroute.h: File removed.
+       * traceroute/Makefile.am (noinst_HEADERS): Variable removed.
+
+2009-10-26  Alfred M. Szmidt  <address@hidden>
+
+       * rcp/rcp.c: Include <sys/wait.h>.  Removed include for
+       "extern.h".
+       (BUF): New structure (from rcp/util.c).
+       (allocbuf, colon, lostconn, nospace, okname, run_err, susystem)
+       (verifydir): New functions (from rcp/util.c).
+       * rcp/extern.h, rcp/util.c: Files removed.
+       * rcp/Makefile.am (rcp_SOURCES): Removed `util.c'.
+       (noinst_HEADERS): Variable removed.
+
+2009-10-23  Alfred M. Szmidt  <address@hidden>
+
+       * ftpd/README.sec, ping/README.sec, syslogd/README.sec,
+       talkd/README.sec, telnet/README.sec, telnetd/README.sec: Files
+       removed.
+
+       * whois/README: File removed.
+
+2009-10-23  Alfred M. Szmidt  <address@hidden>
+
+       * whois/TODO, ping/TODO, libicmp/TODO, ifconfig/TODO: Files
+       removed (content merged into top-level TODO).
+       * TODO: Updated.
+
+2009-10-23  Alfred M. Szmidt  <address@hidden>
+
+       Renamed `gwhois' to `whois'.
+
+       * Makefile.am (SUBDIRS): Renamed `gwhois' to `whois'
+       * configure.ac: Likewise.
+
+       * gwhois/.gitignore: Renamed file to ...
+       * whois/.gitignore: ... this.
+
+       * gwhois/Makefile.am: Renamed file to ...
+       * whois/Makefile.am: ... this.
+
+       * gwhois/README: Renamed file to ...
+       * whois/README: ... this.
+
+       * gwhois/TODO: Renamed file to ...
+       * whois/TODO: ... this.
+
+       * gwhois/as_del_list: Renamed file to ...
+       * whois/as_del_list: ... this.
+
+       * gwhois/data.h: Renamed file to ...
+       * whois/data.h: ... this.
+
+       * gwhois/ip_del_list: Renamed file to ...
+       * whois/ip_del_list: ... this.
+
+       * gwhois/make_as_del.pl: Renamed file to ...
+       * whois/make_as_del.pl: ... this.
+
+       * gwhois/make_ip_del.pl: Renamed file to ...
+       * whois/make_ip_del.pl: ... this.
+
+       * gwhois/make_tld_serv.pl: Renamed file to ...
+       * whois/make_tld_serv.pl: ... this.
+
+       * gwhois/tld_serv_list: Renamed file to ...
+       * whois/tld_serv_list: ... this.
+
+       * gwhois/whois.c: Renamed file to ...
+       * whois/whois.c: ... this.
+
+       * gwhois/whois.h: Renamed file to ...
+       * whois/whois.h: ... this.
+
+2009-10-23  Alfred M. Szmidt  <address@hidden>
+
+       * .gitignore (ChangeLog): Removed from list.
+
+2009-10-23  Alfred M. Szmidt  <address@hidden>
+
+       * rexec/.gitignore: New file.
+
 2009-10-20  Rakesh Pandit  <address@hidden>
 
        * ping/ping.c (parse_opt): Handle `--debug' and `--ignore-routing'
@@ -54,7 +174,7 @@
 2009-08-18  Sergey Poznyakoff  <address@hidden>
 
        Fix possible array overflow in ping.
-       
+
        * ping/ping.h (_C_BIT,_C_MASK)
        (_PING_SET,_PING_CLR,_PING_TST): Remove in favor of
        ping_common.h
@@ -68,7 +188,7 @@
 2009-07-19  Sergey Poznyakoff  <address@hidden>
 
        Fix net-tool output format in ifconfig.
-       
+
        * configure.ac: Check for struct ifreq.ifr_map
        * paths: Add PATH_PROCNET_DEV
        * ifconfig/Makefile.am (AM_CPPFLAGS): Add $(PATHDEF_PROCNET_DEV)
@@ -90,7 +210,7 @@
        * ping/ping_echo.c: Likewise.
        * ping/ping_router.c: Likewise.
        * ping/ping_timestamp.c: Likewise.
-       
+
 2009-07-10  Giuseppe Scrivano <address@hidden>
             Alfred M. Szmidt <address@hidden>
 
diff --git a/ChangeLog.0 b/ChangeLog.0
index c9eb3b5..ff362d3 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -8,7 +8,7 @@ Sun Apr 26 19:37:09 1998  Joel N. Weber II  <address@hidden>
 
        * syslogd/syslogd.c (logmsg): When opening the console device,
        pass the O_NOCTTY flag to avoid acquiring a controlling tty.
-       
+
        (fprintlog): When opening a log file, pass the O_CREAT flags and
        O_NOCTTY flags.
        (cfline): Likewise.
@@ -32,39 +32,39 @@ Fri Apr 10 11:13:51 1998  Joel N. Weber II  <address@hidden>
 Fri Apr 10 19:53:37 1998  Joel N. Weber II  <address@hidden>
 
        * libinetutils/opieclient.c: Random cosmetic changes.
-       
+
        [HAVE_CONFIG_H]: Inclued config.h.
 
 Fri Apr 10 11:13:51 1998  Joel N. Weber II  <address@hidden>
 
        * whois/main.c (main): Use inetutils_package and inetutils_version
        rather than PACKAGE and VERSION.
-       
+
        Check the compiled in config file as the second-to-last resort.
-       
+
        (config_buffer_netwhois): New function, mostly created by ripping code
        out of config_file_netwhois.
-       
+
        (config_file_netwhois): Use config_buffer_netwhois.
 
        * whois/Makefile.am (whois_SOURCES): Added config.c.
-       
+
        (EXTRA_DIST): Added gen-config-c.
-       
+
        (config.c): Added a rule to generate it from whois-servers using the
        gen-config-c script.
 
        * Makefile.am (SUBDIRS): Added ping.
 
        * configure.in: Call IU_ENABLE_CLIENT and AC_SUBST for whois.
-       
+
        Update the comment above the AC_SUBST calls for BUILD_<whatever>;
        the change of moving AC_SUBST out of IU_ENABLE_FOO wasn't actually
        necissary.
-       
+
        Test for -lz, since I will probably add code that uses it
        eventually.
-       
+
        Supply a value for inetdaemondir.
 
 Fri Apr  3 17:11:44 1998  Joel N. Weber II  <address@hidden>
@@ -83,9 +83,9 @@ Thu Mar 26 20:40:06 1998  Joel N. Weber II  <address@hidden>
 
        * glob/Makefile.am (AUTOMAKE_OPTIONS): Removed; the options are
        set adaquaely in ../Makefile.am.
-       
+
        (noinst_LIBRARIES): Use @BUILD_LIBGLOB@ rather than libglob.a
-       
+
        (EXTRA_LIBRARIES): Added libglob.a
 
        * Makefile.am (DISTCLEANFILES): Added `include/*.h include/*/*.h
@@ -94,7 +94,7 @@ Thu Mar 26 20:40:06 1998  Joel N. Weber II  <address@hidden>
        * acinclude.m4 (IU_ENABLE_FOO): Fix syntax errors.  Remove call to
        AC_SUBST; there are now many explicit calls to AC_SUBST to make
        automake happy.
-       
+
        (IU_ENABLE_CLIENT): Use `clients' rather than `client' as the
        second arg.
        (IU_ENABLE_SERVER): Use `servers' rather than `server' as the
@@ -110,21 +110,21 @@ Thu Mar 26 20:40:06 1998  Joel N. Weber II  
<address@hidden>
        changing the version number will not force me to wait 20+ minutes
        (or so it seems) for the inetutils to be rebuilt after I change
        the version number.
-       
+
        Rearrange a few macro calls that were added for the glob library
        so that autoconf doesn't complain that they're out of order.
-       
+
        Removed some more of the old SUBDIRS cruft.
-       
+
        When setting enable_talk to `no' after not finding curses, also
        set BUILD_TALK to the empty string.
-       
+
        Set the BUILD_LIBGLOB variable appropriately.
 
        * ping/ping.c (version.h): Include it.
-       
+
        (show_usage): Use inetutils_bugaddr.
-       
+
        (main): Use inetutils_version rather than VERSION.  Don't use
        GNU_PACKAGE.
 
@@ -147,16 +147,16 @@ Thu Mar 26 00:08:39 1998  Joel N. Weber II  
<address@hidden>
        * ftp/Makefile.am (LDADD): Added `$(LIBTERMCAP)'.
 
        * Makefile.am (SUBDIRS): Added whois.
-       
+
        (DISTCLEANFILES): Added `pathdefs.make paths.defs'.
 
        * configure.in: Removed some old cruft related to the old system
        of not building some directoies.
-       
+
        Added calls to IU_ENABLE_SERVER and IU_ENABLE_CLIENT.
-       
+
        Added checks for libtermcap, libreadline, and libopie.
-       
+
        Generate whois/Makefile.
 
        * acinclude.m4 (IU_ENABLE_FOO): New AC_DEFUN.
@@ -168,13 +168,13 @@ Tue Mar 24 11:46:55 1998  Joel N. Weber II  
<address@hidden>
        * Ran the command for i in `grep man_MANS */Makefile.am|awk -F: '{
        print $1 }'`; do (echo;echo 'EXTRA_DIST = $(man_MANS)') >> $i;
        done
-       
+
        * configure.in (AM_INIT_AUTOMAKE): Added a third argument to
        suppress VERSION and PACKAGE symbols from appearing in config.h
-       
+
        Added much code that was formerly in glob/configure.in, before I
        removed that file.
-       
+
        Add glob/Makefile to the `AC_OUTPUT' call.
 
        * headers/Makefile.am (EXTRA_DIST): Added `confpaths.h.in'.
@@ -182,41 +182,41 @@ Tue Mar 24 11:46:55 1998  Joel N. Weber II  
<address@hidden>
        * ftp/Makefile.am (LDADD): Added `$(LIBGLOB)'.
 
        * Makefile.am (EXTRA_DIST): Added paths.
-       
+
        (SUBDIRS): Added glob.
 
        * uucpd/Makefile.am (INCLUDES): Added `$(PATHDEF_TTY)'.
-       
+
        (LDADD): Added `-L../libinetutils -linetutils'.
 
        * telnetd/Makefile.am: Added a line that reads address@hidden@'.
-       
+
        (INCLUDES): Added `$(PATHDEF_TTY) $(PATHDEF_LOGIN)'.
 
        * talkd/Makefile.am: Added a line that reads address@hidden@'.
-       
+
        (INCLUDES): Added `$(PATHDEF_DEV)'.
 
        * syslogd/Makefile.am: Added a line that reads address@hidden@'.
-       
+
        (INCLUDES): Added `$(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGPID)
        $(PATHDEF_CONSOLE)'.
 
        * rshd/Makefile.am (INCLUDES): Added `$(PATHDEF_BSHELL)
        $(PATHDEF_NOLOGIN) $(PATHDEF_DEFPATH)'.
-       
+
        Added a line reading address@hidden@'.
 
        * rlogind/Makefile.am (INCLUDES): Added `$(PATHDEF_DEV)
        $(PATHDEF_LOGIN)'.
-       
+
        Added a line reading address@hidden@'.
 
        * rexecd/Makefile.am (INCLUDES): Added `$(PATHDEF_DEFPATH)
        $(PATHDEF_BSHELL)'.
-       
+
        (LDADD): Added `-L../libinetutils -linetutils'.
-       
+
        Added a line reading address@hidden@'.
 
        * rcp/Makefile.am (INCLUDES): Added `$(PATHDEF_BSHELL)'.
@@ -232,43 +232,43 @@ Tue Mar 24 11:46:55 1998  Joel N. Weber II  
<address@hidden>
 
        * ftp/Makefile.am (INCLUDES): Added `$(PATHDEF_TMP)
        $(PATHDEF_BSHELL)'.
-       
+
        Added a line reading address@hidden@'.
 
 Tue Mar 24 00:28:27 1998  Joel N. Weber II  <address@hidden>
 
        * telnet/Makefile.am (noinst_HEADERS): Remove krb4-proto.h;
        Kerberos 4 doesn't meet our definition of `free software'.
-       
+
        (INCLUDES): Add `-DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK'.
-       
+
        (LDADD): Add `-L../libinetutils -L../libtelnet -linetutils -ltelnet
        $(LIBTERMCAP) $(LIBCRYPT)'.
-       
+
        (LIBTERMCAP): Set make variable from coresponding configure variable
        (LIBCRYPT): Likewise.
 
        * uucpd/Makefile.am (INCLUDES): Added `$(PATHDEF_UUCICO)'.
-       
+
        Added a line that reads address@hidden@'.
 
        * tftpd/Makefile.am (noinst_HEADERS): Removed tftpsubs.h
-       
+
        (LDADD): Added `-L../libinetutils -linetutils'.
 
        * tftp/Makefile.am (tftp_SOURCES): Removed tftpsubs.c; that file
        has been moved to ../libinetutils.
-       
+
        (noinst_HEADERS): Removed tftpsubs.h; that file has been moved to
        ../headers.
-       
+
        (LDADD): Added `-L../libinetutils -linetutils'.
 
 Mon Mar 23 11:47:37 1998  Joel N. Weber II  <address@hidden>
 
        * telnetd/Makefile.am (LIBTERMCAP, LIBCRYPT, LIBUTIL): Set make
        variables corresponding to the configure variables.
-       
+
        (LDADD): Added `-L../libinetutils -L../libtelnet -linetutils -ltelnet
        $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT)'.
 
@@ -276,7 +276,7 @@ Mon Mar 23 11:47:37 1998  Joel N. Weber II  <address@hidden>
        -linetutils'.
 
        * talk/Makefile.am (INCLUDES): Added `$(NCURSES_INCLUDE)'.
-       
+
        (LDADD): Added `$(LIBCURSES) -L../libinetutils -linetutils'.
 
        * syslogd/Makefile.am (LDADD): Added `-L../libinetutils
@@ -292,66 +292,66 @@ Mon Mar 23 11:47:37 1998  Joel N. Weber II  
<address@hidden>
 
        * rcp/Makefile.am (INCLUDES): Added `$(PATHDEF_RSH)
        $(PATHDEF_CP)'.
-       
+
        (LDADD): Added `-L../libinetutils -linetutils'.
-       
+
        Added a line address@hidden@'.
 
        * ftpd/Makefile.am (INCLUDES): Added `$(PATHDEF_FTPWELCOME)
        $(PATHDEF_FTPUSERS) $(PATHDEF_FTPLOGINMESG)'.
-       
+
        (LDADD): Added `-L../libinetutils -L../libtelnet -linetutils -ltelnet'.
-       
+
        Added the line address@hidden@'.
 
        * ftp/Makefile.am (LDADD): Added ../libinetutils -linetutils.
 
        * libinetutils/Makefile.am (libinetutils_a_SOURCES): Removed
        version.c and all the files covered by @LIBOBS@
-       
+
        (libinetutils_a_LIBADD): Add @LIBOBJS@
-       
+
        (noinst_HEADERS): Removed version.h
 
        * configure.in: Removed some old, commented-out cruft.
-       
+
        Removed some old code related to the @DIRS@ hack; that code will
        not be needed in the future.
-       
+
        Reinstalled some code that deals with having both a `headers' and
        `include' tree.
-       
+
        Removed the iruserok from one of the two places where it appeared
        in the AC_REPLACE_FUNCS call.
-       
+
        Reinstalled the line `AC_REPLACE_FUNCS(revoke)'; it had been
        commented out, but I see no ChangeLog entry explaining why, and I
        suspect that it should not have been commented out.
-       
+
        Changed the message that was `checking for system glob is ok' to
        `checking for ok system glob'.
-       
+
        Call `AC_SUBST(VERSION)'.
-       
+
        In the call to AC_OUTPUT, added version.h.
 
 Sun Mar 22 16:13:49 1998  Joel N. Weber II  <address@hidden>
 
        * Makefile.am (SUBDIRS): Use an explicit list, rather than 
@address@hidden
-       
+
        Removed some random cruft that I'd previously mistakenly added
        that is not necissary.
 
        * headers/Makefile.am (EXTRA_DIST): Renamed variable from
        noinst_HEADERS.  Added tftpsubs.h.  Changed version.h to
        version.h.in.
-       
+
        (dist-hook): Added to distribute some files in the arpa and protocols
        directories.
 
        * inetd/Makefile.am (INCLUDES): Use $(PATHDEF_INETDCONF) instead
        of the old hardcoded value.
-       
+
        Added a line that reads address@hidden@'
 
 Mon Mar  9 17:04:55 1998  Joel N. Weber II  <address@hidden>
@@ -541,12 +541,12 @@ Mon Mar  3 17:56:36 1997  Philippe De Muyter  
<address@hidden>
        * libinetutils/krcmd.c, libinetutils/kcmd.c, libinetutils/des_rw.c:
        New files (moved from rlogin directory).
        * rlogin/krcmd.c, rlogin/kcmd.c, rlogin/des_rw.c: Files removed
-       (moved to libinetutils directory). 
+       (moved to libinetutils directory).
        * libinetutils/Makefile.in (SRCS): Add krcmd.c, kcmd.c, & des_rw.c.
        (OBJS): Add krcmd.o, kcmd.o, & des_rw.o.
 
        * rlogin/kcmd.c: Protect whole file with #ifdef KERBEROS.
-       
+
        From Alexandre Oliva <address@hidden>:
        * syslogd/syslogd.c (cfline): Remove declaration of hstrerror.
        * telnetd/utility.c (fatalperror): Remove declaration of strerror.
@@ -563,7 +563,7 @@ Mon Mar  3 17:56:36 1997  Philippe De Muyter  
<address@hidden>
        (rlogin): New rule.
        * configure.in: If authentication is enabled, also define KERBEROS.
        * headers/acconfig.h (KERBEROS): New define slot.
-       
+
        * libinetutils/version.c (inetutils_version): Change to `1.3.1'.
 
 1997-09-10  Miles Bader  <address@hidden>
@@ -577,7 +577,7 @@ Mon Mar  3 17:56:36 1997  Philippe De Muyter  
<address@hidden>
        From Martin Buck <address@hidden>:
        * telnet/sys_bsd.c (TerminalNewMode): Don't limit to 7-bits when
        not in binary mode.
-       
+
 1997-07-28  Miles Bader  <address@hidden>
 
        * ftp/ftp.c (recvrequest, gunique): Get rid of
@@ -701,13 +701,13 @@ Tue Feb 18 20:14:48 1997  Kaveh R. Ghazi  <address@hidden>
        * ftpd/ftpd.c: Likewise.  Also handle missing st_blksize member.
        * headers/acconfig.h: Normalize variable argument list usage.
        Also add support to handle missing st_blksize member.
-       * libinetutils/snprintf.c: Normalize variable argument list usage. 
+       * libinetutils/snprintf.c: Normalize variable argument list usage.
        * libinetutils/snprintf.h: Likewise.  Also constify DATA.pf member.
        * rcp/util.c: Handle missing st_blksize member.
        * rexecd/rexecd.c: Make environ extern to avoid link time conflicts.
        * rshd/rshd.c: Likewise.
        * telnetd/ext.h: Make terminaltype and line be extern to avoid
-       link time conflicts. 
+       link time conflicts.
        * telnetd/sys_term.c (rmut): protect use of ut_host member.
        * telnetd/telnetd.c (main, doit): Likewise.
        (utmp_len): Only declare if HAVE_UTMP_UT_HOST.
@@ -715,7 +715,7 @@ Tue Feb 18 20:14:48 1997  Kaveh R. Ghazi  <address@hidden>
        * tftp/tftp.c (toplevel): Duplicate definition removed.
        * uucpd/uucpd.c (dologout): Remove unused status variable.  Add a
        case for HAVE_WAITPID.
-       
+
 Tue Feb 18 01:13:16 1997  Miles Bader  <address@hidden>
 
        From Alain Magloire <address@hidden>:
@@ -878,7 +878,7 @@ Fri Jan 24 14:17:08 1997  Miles Bader  <address@hidden>
        CPPFLAGS-ttymsg.c, CPPFLAGS-cleansess.c, CPPFLAGS-daemon.c):
        New variables.
        (CPPFLAGS): Variable removed.
-       
+
        * telnet/commands.c (set_mode): Renamed from setmode, to avoid
        conflict with netbsd <unistd.h>; all references changed.
        (clear_mode): Renamed from clearmode, for consistency with
@@ -889,7 +889,7 @@ Fri Jan 24 14:17:08 1997  Miles Bader  <address@hidden>
        termcap library when it exists.
        (IU_LIB_CURSES): Special case ncurses (it never requires termcap).
        (_iu_curses_needs_termcap): Macro removed.
-       
+
        * uucpd/uucpd.c (doit): Use PATH_UUCICO instead of _PATH_UUCICO.
        (dologin): Use PATH_LASTLOG instead of _PATH_LASTLOG.
        [HAVE_UTMP_H] <utmp.h>: New include.
@@ -945,7 +945,7 @@ Mon Jan 20 20:35:53 1997  Miles Bader  <address@hidden>
        * rsh/rsh.c (main): Always use sigset_t & OSIGS & SIGS variables,
        and pass a pointer to the talk function.
        (talk): Always use a pointer for the OSIGS arg (was OMASK).
-       
+
        * headers/acconfig.h (HAVE_UTMP_UT_TV, sigset_t): Add define slots.
 
        * telnetd/sys_term.c (rmut): Use HAVE_WTMP_UT_TV rather than
@@ -962,7 +962,7 @@ Wed Jan 15 16:52:31 1997  Miles Bader  <address@hidden>
 Mon Jan 20 19:55:30 1997  Kaveh R. Ghazi  <address@hidden>
 
        * ftp/extern.h (command): Constify fmt argument.
-       
+
        * ftp/ftp.c (command): Normalize variable argument list usage.
        Require both HAVE_STDARG_H && __STDC__==1 to allow inclusion of
        <stdarg.h> and use of ellipses, failing either we fall back on
@@ -1104,7 +1104,7 @@ Fri Jan 10 14:22:18 1997  Miles Bader  <address@hidden>
        * configure.in: Add check for the special stuff in <syslog.h>
        enabled by defining SYSLOG_NAMES.
        * headers/acconfig.h (HAVE_SYSLOG_INTERNAL): New define slot.
-       
+
        * iumacros.m4 (IO_CHECK_MACRO): Quote arguments to IU_RESULT_ACTIONS.
 
 Wed Jan  8 14:55:47 1997  Miles Bader  <address@hidden>
@@ -1156,7 +1156,7 @@ Tue Jan  7 13:10:05 1997  Kaveh R. Ghazi  <address@hidden>
        * rshd/rshd.c: Add alloca() support and cast the result of
        alloca().  Also test and include sys/filio.h.
        * rlogind/rlogind.c: Likewise for sys/filio.h. Test and include
-       sys/stream.h, sys/tty.h, sys/ptyvar.h, and sys/sockio.h. 
+       sys/stream.h, sys/tty.h, sys/ptyvar.h, and sys/sockio.h.
        * rexecd/rexecd.c: Likewise for filio.h.
        * tftp/tftpsubs.c: Likewise.
        * rsh/rsh.c: Likewise.
@@ -1169,7 +1169,7 @@ Tue Jan  7 15:33:14 1997  Miles Bader  <address@hidden>
        * libinetutils/revoke.c: New file.
        (AC_REPLACE_FUNCS): Add revoke.
        * libinetutils/Makefile.in (SRCS): Add revoke.c.
-       
+
        * libinetutils/login_tty.c: New file.
        * configure.in (AC_REPLACE_FUNCS): Add login_tty.
        (AC_CHECK_FUNCS): Add setsid.
@@ -1241,7 +1241,7 @@ Sat Jan  4 20:05:29 1997  Miles Bader  <address@hidden>
 Fri Jan  3 17:50:51 1997  Miles Bader  <address@hidden>
 
        * libinetutils/memset.c, libinetutils/memmove.c,
-       libinetutils/setenv.c: New files. 
+       libinetutils/setenv.c: New files.
        * headers/acconfig.h
        [!HAVE_MEMCPY] (memcpy): Define to use memmove.
        [!HAVE_BCOPY] (bcopy): Define to use memmove.
@@ -1377,7 +1377,7 @@ Mon Oct 21 16:21:15 1996  Miles Bader  <address@hidden>
 
        * ftpd/ftpd.c (inetutils_version): Declaration removed.
        "version.h": New include.
-       
+
 Fri Sep 27 13:07:03 1996  Miles Bader  <address@hidden>
 
        * libinetutils/version.c (inetutils_bugaddr): New variable.
@@ -1452,7 +1452,7 @@ Thu Aug 15 22:29:46 1996  Miles Bader  <address@hidden>
        * logwtmp.c: File removed.
        * configure.in: Add check for errno being declared.
        * libinetutils/logwtmp.c [!HAVE_ERRNO_DECL] (errno): New decl.
-       [HAVE_ERRNO_H] <errno.h>: New 
+       [HAVE_ERRNO_H] <errno.h>: New
        [KEEP_OPEN] Add code to define `logwtmp_keep_open' version.
        * libinetutils/logwtmp.c <sys/fcntl.h>: New include.
        * libinetutils/Makefile.in (CPPFLAGS): Add $(PATHDEF_WTMP) and
@@ -1548,7 +1548,7 @@ Tue Aug  6 01:44:37 1996  Miles Bader  <address@hidden>
        * rcp/util.c (susystem): Likewise.
        * rcp/rcp.c (toremote, tolocal): Likewise.
        * telnetd/sys_term.c (start_login): Likewise.
-       
+
 Mon Aug  5 00:23:07 1996  Miles Bader  <address@hidden>
 
        * configure.in: Check to see if the fd_set macros are defined by
@@ -1566,7 +1566,7 @@ Mon Aug  5 00:23:07 1996  Miles Bader  <address@hidden>
 
        * rsh/rsh.c: [HAVE_STDARG_H] <stdarg.h>: New include.
        [!HAVE_STDARG_H] <varargs.h>: Conditionalize include.
-       
+
        * libinetutils/hstrerror.c: New file.
        * libinetutils/Makefile.in (SRCS): Add strerror.c & hstrerror.c.
        * headers/acconfig.h (HAVE_H_ERRLIST_DECL): New define slot.
@@ -1722,7 +1722,7 @@ Mon Jul 22 00:14:09 1996  Miles Bader  <address@hidden>
        Check for sig_t.
        (AC_CHECK_FUNCS): Temporarily add $LIBUTIL to $LIBS while doing this.
        * headers/acconfig.h (HAVE_SYS_ERRLIST_DECL, HAVE_SIG_T,
-       HAVE___PROGNAME, HAVE_SNPRINTF): New entries. 
+       HAVE___PROGNAME, HAVE_SNPRINTF): New entries.
        [!HAVE_SIG_T] (sig_t): New macro.
        * libinetutils/err.c: New file.
        * libinetutils/__progname.c: New file.
@@ -1772,7 +1772,7 @@ Sun Jul 21 12:19:48 1996  Miles Bader  <address@hidden>
        libinetutils/localhost.c, inetd/inetd.c, ftpd/ftpd.c, ftpd/ftpcmd.y,
        ftp/main.c, ftp/ftp.c, ftp/domacro.c, ftp/cmdtab.c, ftp/cmds.c
        [HAVE_CONFIG_H] <config.h>: New include.
-       
+
        * rules.make (install, uninstall, mostlyclean, distclean,
        maintainer-clean, dist): Make :: rules.
        (clean): New rule.
@@ -1883,7 +1883,7 @@ Thu Jul 11 00:39:45 1996  Miles Bader  <address@hidden>
        * telnet/main.c (help): Remove extra newlines.  Fiddle text.
 
 Wed Jul 10 03:41:39 1996  Miles Bader  <address@hidden>
-       
+
        * ftp/main.c (ohelp, try_help, usage): New functions.
        (long_options): New variable.
        (main): Use getopt_long, and new help functions.
@@ -1904,7 +1904,7 @@ Wed Jul 10 03:41:39 1996  Miles Bader  <address@hidden>
        * ftpd/logwtmp.c (logwtmp): If HAVE_SETUTENT_R, use a more sysvish
        style of wtmp frobbing.
        * configure.in (AC_CHECK_FUNCS): Add setutent_r & logwtmp.
-       
+
        * Makefile.in (distclean, clean): Split out targets, and clean up here.
        Use $(SUBDIRS).
 
@@ -1957,7 +1957,7 @@ Wed Jul 10 03:41:39 1996  Miles Bader  <address@hidden>
        (main): Use help sometimes instead of usage.  Use getopt_long.
        Add --help and --version options.
        <getopt.h>, "version.h": New includes.
-       
+
        * libinetutils: New directory, mostly from old comon dir.
        * common: Dir removed.
        * config.make.in (CPPFLAGS): Add -I../include.
diff --git a/Makefile.am b/Makefile.am
index 7d2d1b8..5c9f40c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. 
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA. 
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 AUTOMAKE_OPTIONS = 1.9
 
@@ -24,7 +25,7 @@ EXTRA_DIST = README-alpha paths ChangeLog.0
 
 SUBDIRS = lib headers libinetutils libtelnet \
        hostname inetd telnetd libls ftpd rshd rlogind uucpd rexecd syslogd \
-       tftpd talkd telnet ftp rsh rcp rlogin tftp logger gwhois talk \
+       tftpd talkd telnet ftp rsh rcp rlogin tftp logger whois talk \
        libicmp ping doc ifconfig traceroute rexec tests
 
 DISTCLEANFILES = pathdefs.make paths.defs
diff --git a/NEWS b/NEWS
index 30beda0..a24bd03 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,6 @@
-GNU inetutils NEWS -- history of user-visible changes. 2009-10-06
-
-Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 
-         Free Software Foundation, Inc.
+GNU inetutils NEWS -- history of user-visible changes. 2009-10-29
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 See the end of this file for for license conditions.
 
 Please send inetutils bug reports to <address@hidden>.
diff --git a/README-alpha b/README-alpha
index d0e56aa..fb58b65 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,7 +1,10 @@
 This is the GNU Inetutils package.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009 Free Software Foundation, Inc.
+See end of file for copying conditions.
 
 This document describes the actions needed to build the pre-release or
-Git version of the package.  See end of file for copying conditions.
+Git version of the package.
 
 * Introduction
 
@@ -94,20 +97,17 @@ available from <http://autobuild.josefsson.org/inetutils/>
 Statistics based on Git commit logs are available from
 <http://gitstats.josefsson.org/inetutils/>.
 
-* Copyright information:
+* Copyright information
 
-Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-
-   Permission is granted to anyone to make or distribute verbatim copies
-   of this document as received, in any medium, provided that the
-   copyright notice and this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
-
-   Permission is granted to distribute modified versions
-   of this document, or of portions of it,
-   under the above conditions, provided also that they
-   carry prominent notices stating who last changed them.
+Permission is granted to anyone to make or distribute verbatim copies
+of this document as received, in any medium, provided that the
+copyright notice and this permission notice are preserved,
+thus giving the recipient permission to redistribute in turn.
 
+Permission is granted to distribute modified versions
+of this document, or of portions of it,
+under the above conditions, provided also that they
+carry prominent notices stating who last changed them.
 
 Local Variables:
 mode: outline
diff --git a/TODO b/TODO
index 9e96ed9..2e13231 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,10 @@
+* General
+
+Files without a copyright notice: ChangeLog, ChangeLog.0, README,
+README-hacking, THANKS, TODO, confpaths.h.in, ifconfig/COMPATIBILITY,
+whois/as_del_list, whois/ip_del_list, whois/make_as_del.pl,
+whois/make_ip_del.pl, whois/make_tld_serv.pl, and whois/tld_serv_list.
+
 Add autoconf check for bison.
 
 Go through code and check what is clean, needs cleaning, etc.
@@ -77,3 +84,54 @@ translations, especially for the clients.
 2.0 will be a release that tries to put as much as possible into
 libraries (startup code, etc).  We would also like to try and write
 (or convince someone else to write) a gopher and gopherd pair.
+
+* libicmp
+
+Handle timestamp, router discovery and address packets.
+
+
+* ping/ping6
+
+Ability to send router discovery, address and maybe timestamp packets.
+
+Ability to ping multiple host in one go.
+
+* ifconfig
+
+** Implement flags support in changeif.c and options.c
+** Fix and move if_index.c to libinetutils.
+** Port to BSD.
+** Make sure it is a drop in replacement at least for the most
+   common options on Linux and BSD.
+
+** Some systems can provide more interfaces than
+  SIOCGIFCONF/if_nameindex, interfaces which are usually not UP but
+  registered nevertheless.
+  (linux: /prov/net/dev). Some support for that?
+
+** Honour IFF_CANTCHANGE when working in flag setting in brdaddr,
+  dstaddr, etc.
+
+** We could put the option parsing (invocation of getopt_long) into a
+  function like parse_opt_rest, which could be used by
+  system_parse_opt_rest to continue parsing the options as usual after
+  processing a non-option.
+
+** Is it necessary to merge long/short options intelligently?
+  For example, if a system specific option shadows a normal option?
+  Allow this?
+
+* whois
+
+What about rwhois?
+
+Should support the refer attribute of RIPE-189 objects.
+
+I need a procedure for looking up an IPv6 address in a list of prefixes.
+Will anybody contribute it?
+
+Add Exodus rwhois server (e.g. 216.35.0.0/16).
+
+Local Variables:
+mode: outline
+End:
diff --git a/am/check_macro.m4 b/am/check_macro.m4
index f1670e9..912d419 100644
--- a/am/check_macro.m4
+++ b/am/check_macro.m4
@@ -1,28 +1,30 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <address@hidden>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CHECK_MACRO -- Check for cpp defines
 dnl   $1 - NAME   -- printed in message
 dnl   $2 - INCLS  -- C program text to inculde necessary files for testing
 dnl   $3 - MACROS -- a space-separated list of macros that all must be defined
 dnl                 defaults to NAME
-dnl   $4 - TRUE          -- what to do if all macros are defined; defaults to 
+dnl   $4 - TRUE          -- what to do if all macros are defined; defaults to
 dnl                 AC_DEFINE(upcase(HAVE_$1))
 dnl   $5 - FALSE  -- what to do if some macros aren't defined
 dnl
@@ -46,4 +48,3 @@ changequote([,])dnl
       IU_CVAR[=no])) dnl
   IU_RESULT_ACTIONS(IU_CVAR, [$1], [$4], [$5]) dnl
   undefine([IU_CVAR]) undefine([IU_TAG])])dnl
-
diff --git a/am/check_member.m4 b/am/check_member.m4
index 2b39b4b..8914988 100644
--- a/am/check_member.m4
+++ b/am/check_member.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <address@hidden>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CHECK_MEMBER(AGGREGATE.MEMBER,
 dnl                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
index 141ac8c..dd1f73f 100644
--- a/am/check_weak_refs.m4
+++ b/am/check_weak_refs.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <address@hidden>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CHECK_WEAK_REFS -- See if any of a variety of `weak reference'
 dnl mechanisms works.  If so, this defines HAVE_WEAK_REFS, and one of
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 95757eb..07fdca4 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <address@hidden>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CONFIG_PATHS -- Configure system paths for use by programs
 dnl   $1 - PATHS    -- The file to read containing the paths
@@ -131,7 +133,7 @@ HAVE_$iu_sym
          x|d|f|c|b) iu_test_type=$iu_try;;
 
          *)
-           # Just try the given name, with make-var substitution.  Besides 
+           # Just try the given name, with make-var substitution.  Besides
            # yielding a value if found, this also sets the default.
 
            case "$iu_try" in "\""*"\"")
@@ -199,7 +201,7 @@ HAVE_$iu_sym
     fi
   done <[$1] >$iu_cache_file
 
-  # Read the cache values constructed by the previous loop, 
+  # Read the cache values constructed by the previous loop,
   . $iu_cache_file
 
   # Construct the pathdefs file -- a file of make variable definitions, of
diff --git a/am/enable.m4 b/am/enable.m4
index 051b071..a24ec5f 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -1,26 +1,28 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Written Joel N. Weber II <address@hidden>.
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written Joel N. Weber II.
 
 AC_DEFUN([IU_ENABLE_FOO],
  [AC_ARG_ENABLE($1, AS_HELP_STRING([--disable-$1], [don't compile $1]), ,
                 [enable_]$1[=$enable_]$2)
-[if test "$enable_$1" = yes; then 
+[if test "$enable_$1" = yes; then
    $1_BUILD=$1
    $1_INSTALL_HOOK="install-$1-hook"
 else
diff --git a/am/flushleft.m4 b/am/flushleft.m4
index 34ebd87..03f058d 100644
--- a/am/flushleft.m4
+++ b/am/flushleft.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <address@hidden>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_FLUSHLEFT -- remove all whitespace at the beginning of lines
 dnl This is useful for c-code which may include cpp statements
diff --git a/am/krb5.m4 b/am/krb5.m4
index ae70466..d436d7b 100644
--- a/am/krb5.m4
+++ b/am/krb5.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <address@hidden>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CHECK_KRB5(VERSION,PREFIX)
 dnl Search for a Kerberos implementation in the standard locations plus PREFIX,
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 0ecb765..0c2cba4 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <address@hidden>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_LIB_NCURSES -- check for, and configure, ncurses
 dnl
@@ -79,7 +81,7 @@ dnl Checks for various common libraries implementing the 
termcap interface,
 dnl including ncurses (unless --disable ncurses is specified), curses (which
 dnl does on some systems), termcap, and termlib.  If termcap is found, then
 dnl LIBTERMCAP is defined with the appropriate linker specification.
-dnl 
+dnl
 AC_DEFUN([IU_LIB_TERMCAP], [
   AC_REQUIRE([IU_LIB_NCURSES])
   if test "$LIBNCURSES"; then
diff --git a/am/result.m4 b/am/result.m4
index 32ca19d..b63174f 100644
--- a/am/result.m4
+++ b/am/result.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <address@hidden>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_RESULT_ACTIONS -- generate shell code for the result of a test
 dnl   $1 -- CVAR  -- cache variable to check
diff --git a/bootstrap.conf b/bootstrap.conf
index b73d3a2..e219ac1 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,21 +1,20 @@
-# Bootstrap configuration.
-
-# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
+# bootstrap.conf - Bootstrap configuration.
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Inetutils.
+#
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 # gnulib library name
 gnulib_name=libgnu
@@ -36,7 +35,7 @@ fdl-1.3
 filemode
 getcwd
 getline
-getopt
+getopt-gnu
 getpass
 gettext
 gettext-h
diff --git a/configure.ac b/configure.ac
index 0b8ebb5..57b254a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,21 @@
-# Configuration for inetutils
+# configure.ac - Configuration for inetutils
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
-# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2005, 2006, 
-# 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is part of GNU Inetutils.
 #
-# Written by Miles Bader <address@hidden>
-#
-# This program is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 AC_PREREQ(2.59)
 
@@ -836,7 +833,7 @@ telnetd/Makefile
 tftp/Makefile
 tftpd/Makefile
 uucpd/Makefile
-gwhois/Makefile
+whois/Makefile
 lib/Makefile
 libls/Makefile
 ifconfig/Makefile
diff --git a/doc/.gitignore b/doc/.gitignore
index a5ee19f..24c6478 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,6 +1,6 @@
-inetutils.info*
 Makefile
 Makefile.in
 fdl-1.3.texi
+inetutils.info*
 stamp-vti
 version.texi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1fd20d8..2c8d44e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 info_TEXINFOS = inetutils.texi
 
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index aba0c28..570c866 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -56,8 +56,8 @@
 This manual documents version @value{VERSION} of the @sc{gnu}
 networking utilities.
 
-Copyright @copyright{} 1994, 1995, 1996, 2000, 2001, 2007, 2008, 2009
-Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/ftp/Makefile.am b/ftp/Makefile.am
index 3dd7453..87057c8 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @ftp_BUILD@
 
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 6e31667..172fa5d 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * FTP User Program -- Command Routines.
  */
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 1364bfc..4ca7427 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/ftp/domacro.c b/ftp/domacro.c
index 226cfcb..61e2a65 100644
--- a/ftp/domacro.c
+++ b/ftp/domacro.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/ftp/extern.h b/ftp/extern.h
index abb880d..50f8521 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -1,6 +1,25 @@
-/*-
- * Copyright (c) 1994 The Regents of the University of California.
- * All rights reserved.
+/*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
+ * Copyright (c) 1994
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *     @(#)extern.h    8.3 (Berkeley) 10/9/94
  */
 
 struct timeval;
diff --git a/ftp/ftp.c b/ftp/ftp.c
index c66b2a5..2decbf7 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftp/ftp_var.h b/ftp/ftp_var.h
index b1588df..3e10f22 100644
--- a/ftp/ftp_var.h
+++ b/ftp/ftp_var.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,30 +44,8 @@
  * 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.
- *
- *     @(#)ftp_var.h   8.4 (Berkeley) 10/9/94
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * FTP global variables.
  */
diff --git a/ftp/main.c b/ftp/main.c
index d3dfb0d..67c7bf0 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * FTP User Program -- Command Interface.
  */
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index 147c66c..3eb3dc1 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,27 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index ecf894a..6d5d656 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/ftpd/README.sec b/ftpd/README.sec
deleted file mode 100644
index 0c42279..0000000
--- a/ftpd/README.sec
+++ /dev/null
@@ -1,32 +0,0 @@
-_________________________________________________________________
-CERT* Advisory CA-97.27: FTP Bounce
-
-Original issue date: Dec. 10, 1997
-Last revised: July 9, 1998 
-       Updated information for Digital Equipment Corporation
-
-Description:
-       The core component of the problem is that by using the PORT command in
-       active FTP mode, an attacker may be able to establish connections to
-       arbitrary ports on machines other than the originating client. This
-       behavior is RFC compliant, but it is also potentially a source of
-       security problems for some sites. The example attacks described in the
-       tech tip demonstrate the potential of this vulnerability.
-
-inetutils: corrected in version 1.4
-_________________________________________________________________
-CERT* Advisory CA-97.16 : ftpd Signal Handling Vulnerability
-Original issue date: May 29, 1997
-Last Revised: December 5, 1997
-       Added vendor information for NCR Corporation to the Updates section.
-
-Description:
-       This vulnerability is caused by a signal handling routine increasing
-       process privileges to root, while still continuing to catch other
-       signals. This introduces a race condition which may allow regular, as
-       well as anonymous ftp, users to access files with root privileges.
-       Depending on the configuration of the ftpd server, this may allow
-       intruders to read or write to arbitrary files on the server.
-
-inetutils: not affected from release after 1.2.x
-_________________________________________________________________
diff --git a/ftpd/auth.c b/ftpd/auth.c
index 15ee350..cddcdfb 100644
--- a/ftpd/auth.c
+++ b/ftpd/auth.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftpd/conf.c b/ftpd/conf.c
index 290c1ae..1dcb6b1 100644
--- a/ftpd/conf.c
+++ b/ftpd/conf.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftpd/extern.h b/ftpd/extern.h
index ce1ac8c..c7fab20 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -1,4 +1,24 @@
-/*-
+/*
+  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,30 +45,8 @@
  * 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.
- *
- *     @(#)extern.h    8.2 (Berkeley) 4/4/94
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #include <stdio.h>
 #include <setjmp.h>
 #include <getopt.h>
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index fe4471b..da2123e 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -10,7 +10,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,8 +25,6 @@
  * 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.
- *
- *     @(#)ftpcmd.y    8.3 (Berkeley) 4/6/94
  */
 
 /*
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 8a951cf..38e23c4 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1,3 +1,23 @@
+/*
+  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 /* - Ftp Server
  * Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +47,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * FTP server.
  */
diff --git a/ftpd/logwtmp.c b/ftpd/logwtmp.c
index e001686..99e23f6 100644
--- a/ftpd/logwtmp.c
+++ b/ftpd/logwtmp.c
@@ -1,30 +1,26 @@
 /*
- SYSVish version:
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-Copyright (C) 1996, 2000, 2007 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <address@hidden>, 1996.
+  This file is part of GNU Inetutils.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 3 of the
-License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-You should have received a copy of the GNU Library General
-PublicLicense along with the GNU C Library; see the file COPYING.LIB.
-Ifnot, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
- * BSDish version:
- *  
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
- *  
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -33,14 +29,10 @@ Street, Fifth Floor, Boston, MA 02110-1301 USA.
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University 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 THE REGENTS 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
@@ -52,7 +44,6 @@ Street, Fifth Floor, Boston, MA 02110-1301 USA.
  * 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.
- *  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/ftpd/pam.c b/ftpd/pam.c
index a452408..df80df0 100644
--- a/ftpd/pam.c
+++ b/ftpd/pam.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftpd/popen.c b/ftpd/popen.c
index f59ebe1..2f47954 100644
--- a/ftpd/popen.c
+++ b/ftpd/popen.c
@@ -1,10 +1,27 @@
 /*
+  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software written by Ken Arnold and
- * published in UNIX Review, Vol. 6, No. 8.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -28,28 +45,10 @@
  * 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.
- *
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+/* This code is derived from software written by Ken Arnold and
+   published in UNIX Review, Vol. 6, No. 8.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index bc122dc..da46f40 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/gwhois/README b/gwhois/README
deleted file mode 100644
index 0a31350..0000000
--- a/gwhois/README
+++ /dev/null
@@ -1,31 +0,0 @@
-Why another whois client? Because the RIPE client is a mess of hacks and
-#ifdefs and more complex programs lack features or are bloated.
-
-Notes about the data files:
-- domain names MUST be lowercase and MUST begin with "." or "-".
-- first match wins (for both domains and netblocks)
-- elements in tld_serv_list are matched against the end of the query
-
-Please send me any information you have regarding domains and netblocks
-not correctly handled by the program.
-
-Please also try to compile after defining HAVE_GETADDRINFO and send me
-working #defines for your flavour of UNIX.
-
-The home of the program is http://www.linux.it/~md/software/
-
-
-Other information sources:
-- RIPE-187 and RIPE-189 (from ftp://ftp.ripe.net/ripe/docs/ or
-  http://www.ripe.net/docs/)
-- Greg Woods' awhois script (from ftp.weird.com)
-- the www.geektools.org CGI proxy
-- home of the 6bone client: http://www.ip.qwest.net/~david/software/
-- http://www.apnic.net/db/RIRs.html and
-  http://www.apnic.net/maps/tld-list.html
-- http://www.uninett.no/navn/domreg.html
-- http://www.iahc.org/dns-refs/registry.html
-
-Marco d'Itri
-<address@hidden>
-
diff --git a/gwhois/TODO b/gwhois/TODO
deleted file mode 100644
index 2b9a5f0..0000000
--- a/gwhois/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-What about rwhois?
-
-Should support the refer attribute of RIPE-189 objects.
-
-I need a procedure for looking up an IPv6 address in a list of prefixes.
-Will anybody contribute it?
-
-Add Exodus rwhois server (e.g. 216.35.0.0/16).
-
diff --git a/headers/Makefile.am b/headers/Makefile.am
index 43304ed..1f8435d 100644
--- a/headers/Makefile.am
+++ b/headers/Makefile.am
@@ -1,19 +1,20 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 noinst_HEADERS = tftpsubs.h shishi_def.h
diff --git a/headers/shishi_def.h b/headers/shishi_def.h
index a1c906c..60f8599 100644
--- a/headers/shishi_def.h
+++ b/headers/shishi_def.h
@@ -1,19 +1,21 @@
-/* Copyright (C) 1991, 1992, 1993, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 3 of the
-License, or (at your option) any later version.
+  This file is part of GNU Inetutils.
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-You should have received a copy of the GNU Library General Public
-License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef SHISHI
 # include <sys/socket.h>
diff --git a/headers/tftpsubs.h b/headers/tftpsubs.h
index 84ac7bf..6c3c270 100644
--- a/headers/tftpsubs.h
+++ b/headers/tftpsubs.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *     @(#)tftpsubs.h  8.1 (Berkeley) 6/6/93
  */
 
 /*
diff --git a/hostname/Makefile.am b/hostname/Makefile.am
index 66e6c8a..c7d78f8 100644
--- a/hostname/Makefile.am
+++ b/hostname/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @hostname_BUILD@
 
diff --git a/hostname/hostname.c b/hostname/hostname.c
index 7925862..5b1c0a0 100644
--- a/hostname/hostname.c
+++ b/hostname/hostname.c
@@ -1,21 +1,20 @@
-/* Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+/*
+   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <config.h>
 
@@ -61,8 +60,8 @@ static struct argp_option argp_options[] = {
 #define GRP 0
   {"aliases", 'a', NULL, 0, "alias names", GRP+1},
   {"domain", 'd', NULL, 0, "DNS domain name", GRP+1},
-  {"file", 'F', "FILE", 0, "read host name or NIS domain name "
-   "from FILE", GRP+1},
+  {"file", 'F', "FILE", 0, "set host name or NIS domain name from FILE",
+   GRP+1},
   {"fqdn", 'f', NULL, 0, "DNS host name or FQDN", GRP+1},
   {"long", 'f', NULL, OPTION_ALIAS, "DNS host name or FQDN", GRP+1},
   {"ip-addresses", 'i', NULL, 0, "addresses for the host name", GRP+1},
@@ -147,7 +146,7 @@ main (int argc, char *argv[])
   hostname_options options;
 
   set_program_name (argv[0]);
-  
+
   memset ((void *) &options, 0, sizeof (options));
 
   /* Parse command line */
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index 34158f4..b4501d5 100644
--- a/ifconfig/Makefile.am
+++ b/ifconfig/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 SUBDIRS=system
 
diff --git a/ifconfig/TODO b/ifconfig/TODO
deleted file mode 100644
index caa2944..0000000
--- a/ifconfig/TODO
+++ /dev/null
@@ -1,26 +0,0 @@
--*- Mode: Outline -*-
-
-* Before release:
-
-** Implement flags support in changeif.c and options.c
-** Fix and move if_index.c to libinetutils.
-** Port to BSD.
-** Make sure it is a drop in replacement at least for the most
-   common options on Linux and BSD.
-
-* Some systems can provide more interfaces than
-  SIOCGIFCONF/if_nameindex, interfaces which are usually not UP but
-  registered nevertheless.
-  (linux: /prov/net/dev). Some support for that?
-
-* Honour IFF_CANTCHANGE when working in flag setting in brdaddr,
-  dstaddr, etc.
-
-* We could put the option parsing (invocation of getopt_long) into a
-  function like parse_opt_rest, which could be used by
-  system_parse_opt_rest to continue parsing the options as usual after
-  processing a non-option.
-
-* Is it necessary to merge long/short options intelligently?
-  For example, if a system specific option shadows a normal option?
-  Allow this?
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index c9d9fe5..811735f 100644
--- a/ifconfig/changeif.c
+++ b/ifconfig/changeif.c
@@ -1,24 +1,23 @@
 /* changeif.c -- change the configuration of a network interface
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 23aaca4..cc133a2 100644
--- a/ifconfig/flags.c
+++ b/ifconfig/flags.c
@@ -1,24 +1,23 @@
 /* flags.c -- network interface flag handling
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index 4087dfa..ab2a9ab 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -1,24 +1,23 @@
-/* flags.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_FLAGS_H
 # define IFCONFIG_FLAGS_H
diff --git a/ifconfig/if_index.c b/ifconfig/if_index.c
index 77f8245..ac02e4b 100644
--- a/ifconfig/if_index.c
+++ b/ifconfig/if_index.c
@@ -1,20 +1,21 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2007,
-   2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  This file is part of GNU Inetutils.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/if_index.h b/ifconfig/if_index.h
index a2c5f47..ec97ad7 100644
--- a/ifconfig/if_index.h
+++ b/ifconfig/if_index.h
@@ -1,21 +1,21 @@
-/* if_index.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifndef IF_INDEX_H
 # define IF_INDEX_H
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index 302db75..b55bb06 100644
--- a/ifconfig/ifconfig.c
+++ b/ifconfig/ifconfig.c
@@ -1,23 +1,23 @@
 /* ifconfig.c -- network interface configuration utility
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/ifconfig.h b/ifconfig/ifconfig.h
index 5a62ad2..c4e1238 100644
--- a/ifconfig/ifconfig.h
+++ b/ifconfig/ifconfig.h
@@ -1,23 +1,23 @@
-/* ifconfig.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2008, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_IFCONFIG_H
 # define IFCONFIG_IFCONFIG_H
diff --git a/ifconfig/options.c b/ifconfig/options.c
index c379ab3..05a2d41 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -1,23 +1,23 @@
 /* options.c -- process the command line options
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007, 2008, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/options.h b/ifconfig/options.h
index 23ea79c..d97afce 100644
--- a/ifconfig/options.h
+++ b/ifconfig/options.h
@@ -1,23 +1,23 @@
-/* options.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2008, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_OPTIONS_H
 # define IFCONFIG_OPTIONS_H
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 294233c..3c175bf 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -1,23 +1,23 @@
 /* printif.c -- print an interface configuration
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index 14cd15d..a82ee64 100644
--- a/ifconfig/printif.h
+++ b/ifconfig/printif.h
@@ -1,23 +1,23 @@
-/* printif.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_PRINTIF_H
 # define IFCONFIG_PRINTIF_H
diff --git a/ifconfig/system.c b/ifconfig/system.c
index df6e22f..2e07fec 100644
--- a/ifconfig/system.c
+++ b/ifconfig/system.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 #if defined(__linux__)
 # include "system/linux.c"
 #elif defined(__sun__)
diff --git a/ifconfig/system.h b/ifconfig/system.h
index de3f697..f84c08e 100644
--- a/ifconfig/system.h
+++ b/ifconfig/system.h
@@ -1,23 +1,23 @@
-/* system.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_H
 # define IFCONFIG_SYSTEM_H
diff --git a/ifconfig/system/Makefile.am b/ifconfig/system/Makefile.am
index 8bb4b1b..2b72283 100644
--- a/ifconfig/system/Makefile.am
+++ b/ifconfig/system/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 # *.c probably shouldn't be in here as 'headers'
 # but I'm too tired to figure out the right way right now. -jb
diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c
index a6cf361..ce7dd17 100644
--- a/ifconfig/system/generic.c
+++ b/ifconfig/system/generic.c
@@ -1,24 +1,23 @@
 /* generic.c -- generic system code for ifconfig
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/generic.h b/ifconfig/system/generic.h
index 9e3e679..300be93 100644
--- a/ifconfig/system/generic.h
+++ b/ifconfig/system/generic.h
@@ -1,25 +1,23 @@
-/* generic.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
-
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_GENERIC_H
 # define IFCONFIG_SYSTEM_GENERIC_H
diff --git a/ifconfig/system/hpux.c b/ifconfig/system/hpux.c
index 0a0a856..8448806 100644
--- a/ifconfig/system/hpux.c
+++ b/ifconfig/system/hpux.c
@@ -1,24 +1,23 @@
 /* hpux.c -- HPUX specific code for ifconfig
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/hpux.h b/ifconfig/system/hpux.h
index 519e8ca..6395a41 100644
--- a/ifconfig/system/hpux.h
+++ b/ifconfig/system/hpux.h
@@ -1,24 +1,23 @@
-/* hpux.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_HPUX_H
 # define IFCONFIG_SYSTEM_HPUX_H
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index 1c48db4..188059f 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -1,24 +1,23 @@
 /* linux.c -- Linux specific code for ifconfig
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2005, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/linux.h b/ifconfig/system/linux.h
index fc808e4..7cca9ca 100644
--- a/ifconfig/system/linux.h
+++ b/ifconfig/system/linux.h
@@ -1,24 +1,23 @@
-/* linux.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_LINUX_H
 # define IFCONFIG_SYSTEM_LINUX_H
diff --git a/ifconfig/system/osf.c b/ifconfig/system/osf.c
index 55a18cf..9b1fd11 100644
--- a/ifconfig/system/osf.c
+++ b/ifconfig/system/osf.c
@@ -1,24 +1,23 @@
-/* system/osf.c -- OSF specific code for ifconfig
+/* osf.c -- OSF specific code for ifconfig
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/osf.h b/ifconfig/system/osf.h
index 1f522ef..3be7009 100644
--- a/ifconfig/system/osf.h
+++ b/ifconfig/system/osf.h
@@ -1,24 +1,23 @@
-/* osf.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_HPUX_H
 # define IFCONFIG_SYSTEM_HPUX_H
diff --git a/ifconfig/system/qnx.c b/ifconfig/system/qnx.c
index 3ebc012..3e73c1c 100644
--- a/ifconfig/system/qnx.c
+++ b/ifconfig/system/qnx.c
@@ -1,24 +1,23 @@
-/* generic.c -- generic system code for ifconfig
+/* qnx.c -- QNX specific code for ifconfig
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/qnx.h b/ifconfig/system/qnx.h
index 6aeefd8..92ecc6a 100644
--- a/ifconfig/system/qnx.h
+++ b/ifconfig/system/qnx.h
@@ -1,24 +1,23 @@
-/* solaris.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_SOLARIS_H
 # define IFCONFIG_SYSTEM_SOLARIS_H
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index d725139..33699b5 100644
--- a/ifconfig/system/solaris.c
+++ b/ifconfig/system/solaris.c
@@ -1,24 +1,23 @@
 /* solaris.c -- Solaris specific code for ifconfig
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/solaris.h b/ifconfig/system/solaris.h
index ae13ee0..1611922 100644
--- a/ifconfig/system/solaris.h
+++ b/ifconfig/system/solaris.h
@@ -1,24 +1,23 @@
-/* solaris.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_SOLARIS_H
 # define IFCONFIG_SYSTEM_SOLARIS_H
diff --git a/inetd/Makefile.am b/inetd/Makefile.am
index d989d64..c8ed234 100644
--- a/inetd/Makefile.am
+++ b/inetd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/inetd/inetd.c b/inetd/inetd.c
index d59b60e..f4637c9 100644
--- a/inetd/inetd.c
+++ b/inetd/inetd.c
@@ -1,27 +1,27 @@
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Copyright (c) 1983, 1991, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
- *  
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -30,10 +30,10 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University 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 THE REGENTS 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
diff --git a/lib/.gitignore b/lib/.gitignore
index f9d57b1..d7efcc0 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -23,9 +23,9 @@ basename.c
 btowc.c
 canonicalize-lgpl.c
 canonicalize.h
+charset.alias
 chdir-long.c
 chdir-long.h
-charset.alias
 chown.c
 close-hook.c
 close-hook.h
@@ -56,6 +56,7 @@ fcntl-safer.h
 fcntl.h
 fcntl.in.h
 fd-safer.c
+fdopendir.c
 filemode.c
 filemode.h
 float+.h
@@ -66,6 +67,7 @@ fnmatch.h
 fnmatch.in.h
 fnmatch_loop.c
 fopen-safer.c
+fopen.c
 fseeko.c
 fstatat.c
 getcwd.c
@@ -111,6 +113,7 @@ memchr.valgrind
 mempcpy.c
 memrchr.c
 minmax.h
+mkdir.c
 mkdirat.c
 obstack.c
 obstack.h
@@ -151,6 +154,7 @@ regex.h
 regex_internal.c
 regex_internal.h
 regexec.c
+rmdir.c
 same-inode.h
 save-cwd.c
 save-cwd.h
@@ -161,6 +165,7 @@ sleep.c
 snprintf.c
 sockets.c
 sockets.h
+stat.c
 stdarg.h
 stdarg.in.h
 stdbool.h
@@ -204,12 +209,16 @@ sys_time.h
 sys_time.in.h
 sysexits.h
 sysexits.in.h
+time.h
+time.in.h
 uinttostr.c
 umaxtostr.c
 unistd--.h
 unistd-safer.h
 unistd.h
 unistd.in.h
+unlink.c
+unlinkat.c
 unlocked-io.h
 vasnprintf.c
 vasnprintf.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0948372..e2b0f22 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,20 +1,20 @@
-## Makefile for gnulib/lib                             -*-Makefile-*-
-
-# Copyright (C) 1995-2007 Free Software Foundation, Inc.
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301, USA.
+# Makefile for gnulib/lib                              -*-Makefile-*-
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+# This file is part of GNU Inetutils.
+#
+# GNU Inetutils is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 include gnulib.mk
diff --git a/libicmp/Makefile.am b/libicmp/Makefile.am
index eff4566..0e38470 100644
--- a/libicmp/Makefile.am
+++ b/libicmp/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 noinst_LIBRARIES = libicmp.a
 
diff --git a/libicmp/TODO b/libicmp/TODO
deleted file mode 100644
index 67943db..0000000
--- a/libicmp/TODO
+++ /dev/null
@@ -1 +0,0 @@
-0      timestamp, router discovery and address packets
diff --git a/libicmp/icmp.h b/libicmp/icmp.h
index 52eb009..4951e7f 100644
--- a/libicmp/icmp.h
+++ b/libicmp/icmp.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Structure of an icmp header.
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index 12cf564..a4a7825 100644
--- a/libicmp/icmp_address.c
+++ b/libicmp/icmp_address.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libicmp/icmp_cksum.c b/libicmp/icmp_cksum.c
index def0e23..f49e252 100644
--- a/libicmp/icmp_cksum.c
+++ b/libicmp/icmp_cksum.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libicmp/icmp_echo.c b/libicmp/icmp_echo.c
index 4cf411c..749433f 100644
--- a/libicmp/icmp_echo.c
+++ b/libicmp/icmp_echo.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index 89022d1..dadbfb4 100644
--- a/libicmp/icmp_timestamp.c
+++ b/libicmp/icmp_timestamp.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 75f0aa2..217609b 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 noinst_LIBRARIES = libinetutils.a
 
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index 20064df..e84acd1 100644
--- a/libinetutils/argcv.c
+++ b/libinetutils/argcv.c
@@ -1,19 +1,21 @@
 /* argcv.c - simple functions for parsing input based on whitespace
-   Copyright (C) 1999, 2000, 2001, 2007, 2008 Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  This file is part of GNU Inetutils.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "argcv.h"
 #include <ctype.h>
diff --git a/libinetutils/argcv.h b/libinetutils/argcv.h
index 866f63f..eb3635e 100644
--- a/libinetutils/argcv.h
+++ b/libinetutils/argcv.h
@@ -1,19 +1,21 @@
-/* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifndef _ARGCV_H
 # define _ARGCV_H 1
diff --git a/libinetutils/cleansess.c b/libinetutils/cleansess.c
index fcb11d2..4cd8b30 100644
--- a/libinetutils/cleansess.c
+++ b/libinetutils/cleansess.c
@@ -1,22 +1,23 @@
-/* Clean up the pty and frob utmp/wtmp accordingly after logout
+/* cleansess.c - Clean up the pty and frob utmp/wtmp accordingly after logout
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   Copyright (C) 1996, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Miles Bader <address@hidden>
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3, or (at
-   your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Written by Miles Bader.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index 14ed1dd..44fa337 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libinetutils/defauthors.c b/libinetutils/defauthors.c
index fef8f00..5e4cb58 100644
--- a/libinetutils/defauthors.c
+++ b/libinetutils/defauthors.c
@@ -1,18 +1,20 @@
-/* This file is part of GNU Inetutils.
-   Copyright (C) 2009  Free Software Foundation, Inc.
+/*
+  Copyright (C) 2009 Free Software Foundation, Inc.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; If not, see <http://www.gnu.org/licenses/>. */
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <stdlib.h>
 
diff --git a/libinetutils/des_rw.c b/libinetutils/des_rw.c
index bc471a7..7b77f36 100644
--- a/libinetutils/des_rw.c
+++ b/libinetutils/des_rw.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 2ab4254..0a10cba 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 6bb637c..17a1f25 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libinetutils/libinetutils.h b/libinetutils/libinetutils.h
index a4afb34..5fc3062 100644
--- a/libinetutils/libinetutils.h
+++ b/libinetutils/libinetutils.h
@@ -1,20 +1,20 @@
-/* This file is part of GNU inetutils
-   Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General
-   Public License along with this library; if not, write to the
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301 USA */
+/*
+  Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "config.h"
 #include "argp-version-etc.h"
diff --git a/libinetutils/localhost.c b/libinetutils/localhost.c
index bf63102..54f198d 100644
--- a/libinetutils/localhost.c
+++ b/libinetutils/localhost.c
@@ -1,22 +1,23 @@
-/* A slightly more convenient wrapper for gethostname
+/* localhost.c - A slightly more convenient wrapper for gethostname
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   Copyright (C) 1996, 1997, 2000, 2005, 2006, 2007 Free Software Foundation, 
Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Miles Bader <address@hidden>
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3, or (at
-   your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Written by Miles Bader.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/logwtmp.c b/libinetutils/logwtmp.c
index f41c7f7..0dad8cd 100644
--- a/libinetutils/logwtmp.c
+++ b/libinetutils/logwtmp.c
@@ -1,22 +1,23 @@
-/* A version of bsd `logwtmp' that should be widely portable
+/* logwtmp.c - A version of BSDs `logwtmp' that should be widely portable
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   Copyright (C) 1996, 2000, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Miles Bader <address@hidden>
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3, or (at
-   your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Written by Miles Bader.  */
 
 /* If `KEEP_OPEN' is defined, then a special version of logwtmp is compiled,
    called logwtmp_keep_open, which keeps the wtmp file descriptor open
diff --git a/libinetutils/logwtmpko.c b/libinetutils/logwtmpko.c
index 3e3c3c0..d194c5b 100644
--- a/libinetutils/logwtmpko.c
+++ b/libinetutils/logwtmpko.c
@@ -1,2 +1,21 @@
+/*
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 #define KEEP_OPEN
 #include "logwtmp.c"
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index 9e8dbab..7c8a428 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -1,22 +1,23 @@
-/* Set a signal handler, trying to turning on the SA_RESTART bit
+/* setsig.c - Set a signal handler, trying to turning on the SA_RESTART bit
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   Copyright (C) 1997, 2000, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Miles Bader <address@hidden>
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3, or (at
-   your option) any later version.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Written by Miles Bader.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index 312806b..9c6be8e 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -1,19 +1,21 @@
 /* shishi.c -- functions to use kerberos V with shishi
-   Copyright (C) 1990-1999, 2000, 2002, 2007, 2009 Free Software Foundation, 
Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  This file is part of GNU Inetutils.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index 572e122..7d0245d 100644
--- a/libinetutils/tftpsubs.c
+++ b/libinetutils/tftpsubs.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libinetutils/ttymsg.c b/libinetutils/ttymsg.c
index 30d0df8..2dad30d 100644
--- a/libinetutils/ttymsg.c
+++ b/libinetutils/ttymsg.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libinetutils/utmp_init.c b/libinetutils/utmp_init.c
index 66c7c32..1ce2549 100644
--- a/libinetutils/utmp_init.c
+++ b/libinetutils/utmp_init.c
@@ -1,21 +1,44 @@
-/************************************************************************
-* Copyright 1995 by Wietse Venema.  All rights reserved. Individual files
-* may be covered by other copyrights (as noted in the file itself.)
-*
-* This material was originally written and compiled by Wietse Venema at
-* Eindhoven University of Technology, The Netherlands, in 1990, 1991,
-* 1992, 1993, 1994 and 1995.
-*
-* Redistribution and use in source and binary forms are permitted
-* provided that this entire copyright notice is duplicated in all such
-* copies.
-*
-* This software is provided "as is" and without any expressed or implied
-* warranties, including, without limitation, the implied warranties of
-* merchantibility and fitness for any particular purpose.
-************************************************************************/
-/* Author: Wietse Venema <address@hidden> */
-/* light changes where done to accomodate libinetutils: Alain Magloire */
+/*
+  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
+ * Copyright (c) 1995 Wietse Venema.  All rights reserved.
+ *
+ * Individual files may be covered by other copyrights (as noted in
+ * the file itself.)
+ *
+ * This material was originally written and compiled by Wietse Venema
+ * at Eindhoven University of Technology, The Netherlands, in 1990,
+ * 1991, 1992, 1993, 1994 and 1995.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this entire copyright notice is duplicated in all
+ * such copies.
+ *
+ * This software is provided "as is" and without any expressed or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantibility and fitness for any particular
+ * purpose.
+ */
+
+/* Written by Wietse Venema.  With port to GNU Inetutils done by Alain
+   Magloire.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/utmp_logout.c b/libinetutils/utmp_logout.c
index 9fe77ec..e055b0b 100644
--- a/libinetutils/utmp_logout.c
+++ b/libinetutils/utmp_logout.c
@@ -1,21 +1,44 @@
-/************************************************************************
-* Copyright 1995 by Wietse Venema.  All rights reserved. Individual files
-* may be covered by other copyrights (as noted in the file itself.)
-*
-* This material was originally written and compiled by Wietse Venema at
-* Eindhoven University of Technology, The Netherlands, in 1990, 1991,
-* 1992, 1993, 1994 and 1995.
-*
-* Redistribution and use in source and binary forms are permitted
-* provided that this entire copyright notice is duplicated in all such
-* copies.
-*
-* This software is provided "as is" and without any expressed or implied
-* warranties, including, without limitation, the implied warranties of
-* merchantibility and fitness for any particular purpose.
-************************************************************************/
-/* Author: Wietse Venema <address@hidden> */
-/* light changes for inetutils : Alain Magloire */
+/*
+  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
+ * Copyright (c) 1995 Wietse Venema.  All rights reserved.
+ *
+ * Individual files may be covered by other copyrights (as noted in
+ * the file itself.)
+ *
+ * This material was originally written and compiled by Wietse Venema
+ * at Eindhoven University of Technology, The Netherlands, in 1990,
+ * 1991, 1992, 1993, 1994 and 1995.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this entire copyright notice is duplicated in all
+ * such copies.
+ *
+ * This software is provided "as is" and without any expressed or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantibility and fitness for any particular
+ * purpose.
+ */
+
+/* Written by Wietse Venema.  With port to GNU Inetutils done by Alain
+   Magloire.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libls/Makefile.am b/libls/Makefile.am
index 7d09c7d..bf62b14 100644
--- a/libls/Makefile.am
+++ b/libls/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 noinst_LIBRARIES = @libls_BUILD@
 
diff --git a/libls/cmp.c b/libls/cmp.c
index 7e92947..b674182 100644
--- a/libls/cmp.c
+++ b/libls/cmp.c
@@ -1,13 +1,26 @@
-/*     $OpenBSD: cmp.c,v 1.3 1997/01/03 22:36:07 millert Exp $ */
-/*     $NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $ */
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,6 +46,9 @@
  * SUCH DAMAGE.
  */
 
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/libls/extern.h b/libls/extern.h
index eef0cdc..1bfcbf6 100644
--- a/libls/extern.h
+++ b/libls/extern.h
@@ -1,7 +1,23 @@
-/*     $OpenBSD: extern.h,v 1.5 1999/11/26 23:02:54 millert Exp $      */
-/*     $NetBSD: extern.h,v 1.5 1995/03/21 09:06:24 cgd Exp $   */
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
 
-/*-
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -13,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -28,8 +44,6 @@
  * 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.
- *
- *     @(#)extern.h    8.1 (Berkeley) 5/31/93
  */
 
 int acccmp (const FTSENT *, const FTSENT *);
diff --git a/libls/fts.c b/libls/fts.c
index d2d9883..cf10252 100644
--- a/libls/fts.c
+++ b/libls/fts.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1990, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,11 +29,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/libls/fts.h b/libls/fts.h
index 00aff1b..4123e64 100644
--- a/libls/fts.h
+++ b/libls/fts.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,11 +29,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,8 +44,6 @@
  * 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.
- *
- *     @(#)fts.h       8.3 (Berkeley) 8/14/94
  */
 
 #ifndef _FTS_H
diff --git a/libls/ls.c b/libls/ls.c
index 63ff2f4..bac4c7c 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -1,13 +1,26 @@
-/*     $OpenBSD: ls.c,v 1.13 1999/05/01 23:54:47 deraadt Exp $ */
-/*     $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $  */
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Copyright (c) 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,25 +46,8 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libls/ls.h b/libls/ls.h
index 5e89710..606146f 100644
--- a/libls/ls.h
+++ b/libls/ls.h
@@ -1,13 +1,26 @@
-/*     $OpenBSD: ls.h,v 1.4 1999/05/01 23:54:47 deraadt Exp $  */
-/*     $NetBSD: ls.h,v 1.7 1995/03/21 09:06:33 cgd Exp $       */
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,10 +44,11 @@
  * 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.
- *
- *     @(#)ls.h        8.1 (Berkeley) 5/31/93
  */
 
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein.  */
+
 #define NO_PRINT       1
 
 extern long blocksize;         /* block size units */
diff --git a/libls/print.c b/libls/print.c
index 831c85c..ca7b4fa 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -1,13 +1,26 @@
-/*     $OpenBSD: print.c,v 1.15 2000/01/06 21:32:40 espie Exp $        */
-/*     $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $       */
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Copyright (c) 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,25 +46,8 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libls/stat_flags.c b/libls/stat_flags.c
index f0bbeed..476a5a1 100644
--- a/libls/stat_flags.c
+++ b/libls/stat_flags.c
@@ -1,7 +1,23 @@
-/*     $OpenBSD: stat_flags.c,v 1.4 1999/09/08 07:21:29 millert Exp $  */
-/*     $NetBSD: stat_flags.c,v 1.5 1995/09/07 06:43:01 jtc Exp $       */
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-/*-
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -13,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libls/util.c b/libls/util.c
index e2af7a7..8cc1d9d 100644
--- a/libls/util.c
+++ b/libls/util.c
@@ -1,13 +1,26 @@
-/*     $OpenBSD: util.c,v 1.6 1999/05/05 07:06:01 deraadt Exp $        */
-/*     $NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $    */
+/*
+  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+  2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Copyright (c) 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,6 +46,9 @@
  * SUCH DAMAGE.
  */
 
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index a0285e6..a234750 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 INCLUDES = @INCAUTH@
 
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index c3247d3..8dcabea 100644
--- a/libtelnet/auth-proto.h
+++ b/libtelnet/auth-proto.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *     @(#)auth-proto.h        8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 20d7196..143fb1f 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +16,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/auth.h b/libtelnet/auth.h
index 8aa4495..1102c35 100644
--- a/libtelnet/auth.h
+++ b/libtelnet/auth.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *     @(#)auth.h      8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index cd18756..2e09f28 100644
--- a/libtelnet/enc-proto.h
+++ b/libtelnet/enc-proto.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *     @(#)enc-proto.h 8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 271eac7..d7f875d 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +16,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 0dd7d32..a7056ec 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +16,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index 62f3223..600cac3 100644
--- a/libtelnet/encrypt.h
+++ b/libtelnet/encrypt.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *     @(#)encrypt.h   8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/forward.c b/libtelnet/forward.c
index 021fce8..14012ee 100644
--- a/libtelnet/forward.c
+++ b/libtelnet/forward.c
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/genget.c b/libtelnet/genget.c
index 2be014f..0328f7a 100644
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +16,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/genget.h b/libtelnet/genget.h
index 3763248..2206dbc 100644
--- a/libtelnet/genget.h
+++ b/libtelnet/genget.h
@@ -1,2 +1,20 @@
+/*
+  Copyright (C) 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 int isprefix (register char *s1, register char *s2);
 char **genget (char *name, char **table, int stlen);
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index c7b28e6..683d7fb 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +16,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index cc885c9..d512557 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +16,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 0182fe5..edc4bb2 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -1,12 +1,14 @@
 /*
-  Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +16,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libtelnet/key-proto.h b/libtelnet/key-proto.h
index 2bbcc7d..c939123 100644
--- a/libtelnet/key-proto.h
+++ b/libtelnet/key-proto.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *     @(#)key-proto.h 8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/misc-proto.h b/libtelnet/misc-proto.h
index d0c570f..af52181 100644
--- a/libtelnet/misc-proto.h
+++ b/libtelnet/misc-proto.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *     @(#)misc-proto.h        8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 49a89d2..92b436c 100644
--- a/libtelnet/misc.c
+++ b/libtelnet/misc.c
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/misc.h b/libtelnet/misc.h
index 8442b1a..bdef8c1 100644
--- a/libtelnet/misc.h
+++ b/libtelnet/misc.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *     @(#)misc.h      8.1 (Berkeley) 6/4/93
  */
 
 extern char *UserNameRequested;
diff --git a/libtelnet/read_passwd.c b/libtelnet/read_passwd.c
index 4bd4911..9acf63c 100644
--- a/libtelnet/read_passwd.c
+++ b/libtelnet/read_passwd.c
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +15,9 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index 5c38239..43d06ff 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 2003, 2004, 2005, 2006, 2007,
-                2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
   GNU Inetutils is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /* Written by Simon Josefsson and Nicolas Pouvesle, based on
    kerberos5.c from GNU Inetutils. */
diff --git a/logger/Makefile.am b/logger/Makefile.am
index 49c685d..8316517 100644
--- a/logger/Makefile.am
+++ b/logger/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @logger_BUILD@
 
diff --git a/logger/logger.c b/logger/logger.c
index 1376e19..d5c684d 100644
--- a/logger/logger.c
+++ b/logger/logger.c
@@ -1,21 +1,20 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/paths b/paths
index b43412c..a0117f2 100644
--- a/paths
+++ b/paths
@@ -1,23 +1,22 @@
-# Paths for inetutils
+# paths - Paths for inetutils
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
-# Copyright (C) 1996, 1997, 2000, 2007, 2009 Free Software Foundation, Inc.
+# This file is part of GNU Inetutils.
 #
-# This program is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-#
 # This file describes how to set various paths used by programs in inetutils.
 #
 # The rules that determine what a given PATH_FOO define expands to are:
diff --git a/ping/Makefile.am b/ping/Makefile.am
index d18b004..4697252 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @ping_BUILD@ @ping6_BUILD@
 
diff --git a/ping/README.sec b/ping/README.sec
deleted file mode 100644
index f6e4e46..0000000
--- a/ping/README.sec
+++ /dev/null
@@ -1,38 +0,0 @@
-CERT* Advisory CA-96.26
-
-Original issue date: December 18, 1996
-Last Revised: December 5, 1997
-Updated information for NCR Corporation. 
-
-A complete revision history is at the end of this file. 
-
-Description
-
-The TCP/IP specification (the basis for many protocols used on the 
-       Internet) allows for a maximum packet size of up to 65536 octets (1 
-           octet = 8 bits of data), containing a minimum of 20 octets of IP 
header 
-       information and 0 or more octets of optional information, with the rest 
-       of the packet being data. It is known that some systems will react in 
an 
-       unpredictable fashion when receiving oversized IP packets. Reports 
-       indicate a range of reactions including crashing, freezing, and 
-       rebooting. 
-
-       In particular, the reports received by the CERT Coordination Center 
-       indicate that Internet Control Message Protocol (ICMP) packets issued 
-       via the "ping" command have been used to trigger this behavior. ICMP is 
-       a subset of the TCP/IP suite of protocols that transmits error and 
-       control messages between systems. Two specific instances of the ICMP 
are 
-       the ICMP ECHO_REQUEST and ICMP ECHO_RESPONSE datagrams. These two 
-       instances can be used by a local host to determine whether a remote 
-       system is reachable via the network; this is commonly achieved using 
the 
-       "ping" command. 
-
-       Discussion in public forums has centered around the use of the "ping" 
-       command to construct oversized ICMP datagrams (which are encapsulated 
-       within an IP packet). Many ping implementations by default send ICMP 
-       datagrams consisting only of the 8 octets of ICMP header information 
but 
-       allow the user to specify a larger packet size if desired. 
-
-       You can read more information about this vulnerability on Mike 
-       Bremford's Web page. (Note that this is not a CERT/CC maintained page. 
-       We provide the URL here for your convenience.) 
diff --git a/ping/TODO b/ping/TODO
deleted file mode 100644
index b2307e5..0000000
--- a/ping/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-0      ability to send router discovery, address and maybe timestamp packets
-
diff --git a/ping/libping.c b/ping/libping.c
index 7e56d3d..45eeba0 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -1,21 +1,20 @@
-/* Copyright (C) 1998, 2001, 2005, 2007, 2008 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping.c b/ping/ping.c
index b194c38..35c261f 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1998,2001, 2002, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+/*
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping.h b/ping/ping.h
index f783d21..c7a9306 100644
--- a/ping/ping.h
+++ b/ping/ping.h
@@ -1,21 +1,20 @@
-/* Copyright (C) 1998, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "ping_common.h"
 
diff --git a/ping/ping6.c b/ping/ping6.c
index a65b875..e4db905 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1998, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping6.h b/ping/ping6.h
index d78f971..75c4190 100644
--- a/ping/ping6.h
+++ b/ping/ping6.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2004, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "ping_common.h"
 
diff --git a/ping/ping_address.c b/ping/ping_address.c
index a525e66..bed8093 100644
--- a/ping/ping_address.c
+++ b/ping/ping_address.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /* NOTE: most of existing routers simply discard ICMP_ADDRESS requests. */
 #ifdef HAVE_CONFIG_H
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 9abb002..7021c4e 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1998, 2001, 2002, 2004, 2005, 2007, 2008
-   Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping_common.h b/ping/ping_common.h
index ac1b6a5..cc711f8 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index d7b82d1..d8b6629 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2001, 2002, 2004, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping_impl.h b/ping/ping_impl.h
index 9a2c71a..9ffd6f5 100644
--- a/ping/ping_impl.h
+++ b/ping/ping_impl.h
@@ -1,22 +1,21 @@
-/* Copyright (C) 1998,2001, 2002, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #define PING_MAX_DATALEN (65535 - MAXIPLEN - MAXICMPLEN)
 
diff --git a/ping/ping_router.c b/ping/ping_router.c
index 7dc0fab..c5bf0b2 100644
--- a/ping/ping_router.c
+++ b/ping/ping_router.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2000, 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index 1e64a63..f7ad826 100644
--- a/ping/ping_timestamp.c
+++ b/ping/ping_timestamp.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2000, 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/rcp/Makefile.am b/rcp/Makefile.am
index ec4fdad..6b51629 100644
--- a/rcp/Makefile.am
+++ b/rcp/Makefile.am
@@ -1,28 +1,27 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @rcp_BUILD@
 
 EXTRA_PROGRAMS = rcp
 
-rcp_SOURCES = rcp.c util.c
-
-noinst_HEADERS = extern.h
+rcp_SOURCES = rcp.c
 
 @PATHDEFS_MAKE@
 
diff --git a/rcp/extern.h b/rcp/extern.h
deleted file mode 100644
index 0845215..0000000
--- a/rcp/extern.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *     The Regents of the University of California.  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.
- * 4. Neither the name of the University 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 THE REGENTS 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 THE REGENTS 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.
- *
- *     @(#)extern.h    8.1 (Berkeley) 5/31/93
- */
-
-typedef struct
-{
-  int cnt;
-  char *buf;
-} BUF;
-
-extern int iamremote;
-
-BUF *allocbuf (BUF *, int, int);
-char *colon (char *);
-void lostconn (int);
-void nospace (void);
-int okname (char *);
-void run_err (const char *, ...);
-int susystem (char *, int);
-void verifydir (char *);
diff --git a/rcp/rcp.c b/rcp/rcp.c
index c5727bd..f8af146 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1990, 1992, 1993, 2002
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -64,6 +63,7 @@
 # endif
 #endif
 #include <sys/socket.h>
+#include <sys/wait.h>
 #include <netinet/in.h>
 #ifdef HAVE_NETINET_IN_SYSTM_H
 # include <netinet/in_systm.h>
@@ -95,7 +95,20 @@
 #include <argp.h>
 #include <error.h>
 #include <xalloc.h>
-#include "extern.h"
+
+typedef struct {
+  int cnt;
+  char *buf;
+} BUF;
+
+BUF *allocbuf (BUF *, int, int);
+char *colon (char *);
+void lostconn (int);
+void nospace (void);
+int okname (char *);
+void run_err (const char *, ...);
+int susystem (char *, int);
+void verifydir (char *);
 
 #ifdef KERBEROS
 # include <kerberosIV/des.h>
@@ -1111,3 +1124,121 @@ run_err (const char *fmt, ...)
 
   va_end (ap);
 }
+
+char *
+colon (char *cp)
+{
+  if (*cp == ':')              /* Leading colon is part of file name. */
+    return (0);
+
+  for (; *cp; ++cp)
+    {
+      if (*cp == ':')
+       return (cp);
+      if (*cp == '/')
+       return (0);
+    }
+  return (0);
+}
+
+void
+verifydir (char *cp)
+{
+  struct stat stb;
+
+  if (!stat (cp, &stb))
+    {
+      if (S_ISDIR (stb.st_mode))
+       return;
+      errno = ENOTDIR;
+    }
+  run_err ("%s: %s", cp, strerror (errno));
+  exit (1);
+}
+
+int
+okname (char *cp0)
+{
+  int c;
+  char *cp;
+
+  cp = cp0;
+  do
+    {
+      c = *cp;
+      if (c & 0200)
+       goto bad;
+      if (!isalpha (c) && !isdigit (c) && c != '_' && c != '-')
+       goto bad;
+    }
+  while (*++cp);
+  return (1);
+
+bad:
+  error (0, 0, "%s: invalid user name", cp0);
+  return (0);
+}
+
+int
+susystem (char *s, int userid)
+{
+  sig_t istat, qstat;
+  int status;
+  pid_t pid;
+
+  pid = vfork ();
+  switch (pid)
+    {
+    case -1:
+      return (127);
+
+    case 0:
+      setuid (userid);
+      execl (PATH_BSHELL, "sh", "-c", s, NULL);
+      _exit (127);
+    }
+  istat = signal (SIGINT, SIG_IGN);
+  qstat = signal (SIGQUIT, SIG_IGN);
+  if (waitpid (pid, &status, 0) < 0)
+    status = -1;
+  signal (SIGINT, istat);
+  signal (SIGQUIT, qstat);
+  return (status);
+}
+
+BUF *
+allocbuf (BUF * bp, int fd, int blksize)
+{
+  struct stat stb;
+  size_t size;
+
+  if (fstat (fd, &stb) < 0)
+    {
+      run_err ("fstat: %s", strerror (errno));
+      return (0);
+    }
+#ifndef roundup
+# define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
+#endif
+  size = roundup (BUFSIZ, blksize);
+  if (size == 0)
+    size = blksize;
+  if (bp->cnt >= size)
+    return (bp);
+  if ((bp->buf = realloc (bp->buf, size)) == NULL)
+    {
+      bp->cnt = 0;
+      run_err ("%s", strerror (errno));
+      return (0);
+    }
+  bp->cnt = size;
+  return (bp);
+}
+
+RETSIGTYPE
+lostconn (int signo)
+{
+  if (!iamremote)
+    error (0, 0, "lost connection");
+  exit (1);
+}
diff --git a/rcp/util.c b/rcp/util.c
deleted file mode 100644
index 1dceb79..0000000
--- a/rcp/util.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *     The Regents of the University of California.  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.
- * 4. Neither the name of the University 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 THE REGENTS 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 THE REGENTS 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.
- */
-
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/param.h>
-#ifdef HAVE_SYS_SYSMACROS_H
-# include <sys/sysmacros.h>
-#endif
-#include <sys/stat.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <error.h>
-
-#include "extern.h"
-
-char *
-colon (char *cp)
-{
-  if (*cp == ':')              /* Leading colon is part of file name. */
-    return (0);
-
-  for (; *cp; ++cp)
-    {
-      if (*cp == ':')
-       return (cp);
-      if (*cp == '/')
-       return (0);
-    }
-  return (0);
-}
-
-void
-verifydir (char *cp)
-{
-  struct stat stb;
-
-  if (!stat (cp, &stb))
-    {
-      if (S_ISDIR (stb.st_mode))
-       return;
-      errno = ENOTDIR;
-    }
-  run_err ("%s: %s", cp, strerror (errno));
-  exit (1);
-}
-
-int
-okname (char *cp0)
-{
-  int c;
-  char *cp;
-
-  cp = cp0;
-  do
-    {
-      c = *cp;
-      if (c & 0200)
-       goto bad;
-      if (!isalpha (c) && !isdigit (c) && c != '_' && c != '-')
-       goto bad;
-    }
-  while (*++cp);
-  return (1);
-
-bad:
-  error (0, 0, "%s: invalid user name", cp0);
-  return (0);
-}
-
-int
-susystem (char *s, int userid)
-{
-  sig_t istat, qstat;
-  int status;
-  pid_t pid;
-
-  pid = vfork ();
-  switch (pid)
-    {
-    case -1:
-      return (127);
-
-    case 0:
-      setuid (userid);
-      execl (PATH_BSHELL, "sh", "-c", s, NULL);
-      _exit (127);
-    }
-  istat = signal (SIGINT, SIG_IGN);
-  qstat = signal (SIGQUIT, SIG_IGN);
-  if (waitpid (pid, &status, 0) < 0)
-    status = -1;
-  signal (SIGINT, istat);
-  signal (SIGQUIT, qstat);
-  return (status);
-}
-
-BUF *
-allocbuf (BUF * bp, int fd, int blksize)
-{
-  struct stat stb;
-  size_t size;
-
-  if (fstat (fd, &stb) < 0)
-    {
-      run_err ("fstat: %s", strerror (errno));
-      return (0);
-    }
-#ifndef roundup
-# define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
-#endif
-  size = roundup (BUFSIZ, blksize);
-  if (size == 0)
-    size = blksize;
-  if (bp->cnt >= size)
-    return (bp);
-  if ((bp->buf = realloc (bp->buf, size)) == NULL)
-    {
-      bp->cnt = 0;
-      run_err ("%s", strerror (errno));
-      return (0);
-    }
-  bp->cnt = size;
-  return (bp);
-}
-
-RETSIGTYPE
-lostconn (int signo)
-{
-  if (!iamremote)
-    error (0, 0, "lost connection");
-  exit (1);
-}
diff --git a/rexec/.gitignore b/rexec/.gitignore
new file mode 100644
index 0000000..86ca246
--- /dev/null
+++ b/rexec/.gitignore
@@ -0,0 +1 @@
+rexec
diff --git a/rexec/Makefile.am b/rexec/Makefile.am
index 74d9d74..9c9c614 100644
--- a/rexec/Makefile.am
+++ b/rexec/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @rexec_BUILD@
 
diff --git a/rexec/rexec.c b/rexec/rexec.c
index 9ac9246..524b121 100644
--- a/rexec/rexec.c
+++ b/rexec/rexec.c
@@ -3,21 +3,20 @@
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software; you can redistribute it and/or modify
+  GNU Inetutils is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 3 of the License, or
-  (at your option) any later version.
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-  GNU Inetutils is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/* Written by Giuseppe Scrivano <address@hidden>.  */
+/* Written by Giuseppe Scrivano.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/rexecd/Makefile.am b/rexecd/Makefile.am
index 6c0d033..11f36a1 100644
--- a/rexecd/Makefile.am
+++ b/rexecd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/rexecd/rexecd.c b/rexecd/rexecd.c
index 3346171..a1dd6a8 100644
--- a/rexecd/rexecd.c
+++ b/rexecd/rexecd.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Copyright (c) 1983, 1993
@@ -30,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -97,6 +97,7 @@
 #include "libinetutils.h"
 
 void die (int code, const char *fmt, ...);
+int doit (int f, struct sockaddr_in *fromp);
 
 const char doc[] = "remote execution daemon";
 
diff --git a/rlogin/Makefile.am b/rlogin/Makefile.am
index 2a40659..19ce2b3 100644
--- a/rlogin/Makefile.am
+++ b/rlogin/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @rlogin_BUILD@
 
diff --git a/rlogin/rlogin.c b/rlogin/rlogin.c
index 3310d68..0530baf 100644
--- a/rlogin/rlogin.c
+++ b/rlogin/rlogin.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * rlogin - remote login
  */
diff --git a/rlogind/Makefile.am b/rlogind/Makefile.am
index e1596d8..7b645c2 100644
--- a/rlogind/Makefile.am
+++ b/rlogind/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/rlogind/rlogind.c b/rlogind/rlogind.c
index 5aa91a1..1713572 100644
--- a/rlogind/rlogind.c
+++ b/rlogind/rlogind.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 1998, 2001, 2002, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -76,6 +76,7 @@
 #endif
 #include <sys/ioctl.h>
 #include <sys/stat.h>          /* Needed for chmod() */
+#include <pty.h>
 
 #include <progname.h>
 #include <argp.h>
diff --git a/rsh/Makefile.am b/rsh/Makefile.am
index 1ecd01f..07adefa 100644
--- a/rsh/Makefile.am
+++ b/rsh/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @rsh_BUILD@
 
diff --git a/rsh/rsh.c b/rsh/rsh.c
index 2c33509..cc36cc1 100644
--- a/rsh/rsh.c
+++ b/rsh/rsh.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1990, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/rshd/Makefile.am b/rshd/Makefile.am
index 686b10e..6e5ca78 100644
--- a/rshd/Makefile.am
+++ b/rshd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/rshd/rshd.c b/rshd/rshd.c
index 89232fc..38bc10b 100644
--- a/rshd/rshd.c
+++ b/rshd/rshd.c
@@ -1,4 +1,24 @@
-/*-
+/*
+  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1989, 1992, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +47,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * remote shell server:
  *     [port]\0
diff --git a/syslogd/Makefile.am b/syslogd/Makefile.am
index 7da875c..e82a637 100644
--- a/syslogd/Makefile.am
+++ b/syslogd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/syslogd/README.sec b/syslogd/README.sec
deleted file mode 100644
index c16aef3..0000000
--- a/syslogd/README.sec
+++ /dev/null
@@ -1,26 +0,0 @@
-CERT* Advisory CA-95.13
-
-Original issue date: October 19, 1995
-Last revised: September 23, 1997 
-Updated copyright statement 
-
-Description
-
-The syslog(3) subroutine uses an internal buffer for building messages 
-that are sent to the syslogd(8) daemon. This subroutine does no range 
-checking on data stored in this buffer. It is possible to overflow the 
-internal buffer and rewrite the subroutine call stack. It is then 
-possible to execute arbitrary programs. 
-
-This problem is present in virtually all versions of the UNIX Operating 
-System except the following: 
-
-
-       Sony's NEWS-OS 6.X
-               SunOS 5.5 (Solaris 2.5)
-       Linux with libc version 4.7.2 released in May, 1995 
-
-
-       The sendmail(8) program uses the syslog(3) subroutine, and a script has 
-       been written and is being used to exploit the vulnerability. 
-
diff --git a/syslogd/syslogd.c b/syslogd/syslogd.c
index ccaae53..9443846 100644
--- a/syslogd/syslogd.c
+++ b/syslogd/syslogd.c
@@ -1,5 +1,23 @@
 /* syslogd - log system messages
- *
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1988, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -11,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -28,27 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
-
 /*
  *  syslogd -- log system messages
  *
@@ -141,7 +138,7 @@
 /* A mask of all facilities mentioned explicitly in the configuration file
  *
  * This is used to support a virtual facility "**" that covers all the rest,
- * so that messages to unexpected facilities won't be lost when "*" is 
+ * so that messages to unexpected facilities won't be lost when "*" is
  * not logged to a file.
  */
 int facilities_seen;
@@ -444,7 +441,7 @@ main (int argc, char *argv[])
   unsigned long nfds = 0;
 
   set_program_name (argv[0]);
-  
+
   /* Initiliaze PATH_LOG as the first element of the unix sockets array.  */
   add_funix (PATH_LOG);
 
@@ -662,8 +659,8 @@ main (int argc, char *argv[])
                      }
 
                    /* This loop makes sure the daemon won't lock up
-                    * on null bytes in the klog stream.  They still hurt 
-                    * efficiency, acting like a message separator that 
+                    * on null bytes in the klog stream.  They still hurt
+                    * efficiency, acting like a message separator that
                     * forces a shift-and-reiterate when the buffer was
                     * never full.
                     */
@@ -678,7 +675,7 @@ main (int argc, char *argv[])
 
                    if (bol != kline)
                      {
-                       /* shift the partial line to start of buffer, so 
+                       /* shift the partial line to start of buffer, so
                         * we can re-iterate.
                         */
                        memmove (kline, bol, kline_len);
@@ -694,11 +691,11 @@ main (int argc, char *argv[])
                         */
                        printsys (kline);
 
-                       /* Clone priority signal if present 
+                       /* Clone priority signal if present
                         * We merely shift the kline_len pointer after
                         * it so the next chunk is written after it.
                         *
-                        * strchr(kline,'>') is not used as it would allow 
+                        * strchr(kline,'>') is not used as it would allow
                         * a pathological line ending in '>' to cause an
                         * endless loop.
                         */
@@ -1859,7 +1856,7 @@ cfline (const char *line, struct filed *f)
          if (*buf == '*')
            for (i = 0; i <= LOG_NFACILITIES; i++)
              {
-               /* make "**" act as a wildcard only for facilities not 
+               /* make "**" act as a wildcard only for facilities not
                 * specified elsewhere
                 */
                if (buf[1] == '*' && ((1 << i) & facilities_seen))
diff --git a/talk/Makefile.am b/talk/Makefile.am
index 54bab9f..bd1cc01 100644
--- a/talk/Makefile.am
+++ b/talk/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @talk_BUILD@
 
diff --git a/talk/ctl.c b/talk/ctl.c
index 262d007..4e7e7bf 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * This file handles haggling with the various talk daemons to
  * get a socket to talk to. sockt is opened and connected in
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index 898fb5d..3d443f3 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/display.c b/talk/display.c
index 57e631d..9df8ad7 100644
--- a/talk/display.c
+++ b/talk/display.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * The window 'manager', initializes curses and handles the actual
  * displaying of text
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index 875393c..e03e7c8 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/get_names.c b/talk/get_names.c
index c1d4b2c..2e92d13 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/init_disp.c b/talk/init_disp.c
index 58da496..06bf023 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #include <stdlib.h>
 
 /*
diff --git a/talk/invite.c b/talk/invite.c
index 79cc0fc..6875755 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/io.c b/talk/io.c
index b0d198b..434f70d 100644
--- a/talk/io.c
+++ b/talk/io.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * This file contains the I/O handling and the exchange of
  * edit characters. This connection itself is established in
diff --git a/talk/look_up.c b/talk/look_up.c
index f1f57e6..5eda0ce 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/msgs.c b/talk/msgs.c
index c5a5a83..bc25314 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * A package to display what is happening every MSG_INTERVAL seconds
  * if we are slow connecting.
diff --git a/talk/talk.c b/talk/talk.c
index f7534d7..50e77f3 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/talk.h b/talk/talk.h
index 8f154bd..b5358b1 100644
--- a/talk/talk.h
+++ b/talk/talk.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,30 +44,8 @@
  * 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.
- *
- *     @(#)talk.h      8.1 (Berkeley) 6/6/93
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #include <curses.h>
 #include <progname.h>
 
diff --git a/talk/talk_ctl.h b/talk/talk_ctl.h
index d1578db..d1f5f1b 100644
--- a/talk/talk_ctl.h
+++ b/talk/talk_ctl.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,30 +44,8 @@
  * 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.
- *
- *     @(#)talk_ctl.h  8.1 (Berkeley) 6/6/93
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 extern struct sockaddr_in daemon_addr;
 extern struct sockaddr_in ctl_addr;
 extern struct sockaddr_in my_addr;
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index 0b0fe09..632a49b 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/talkd/README.sec b/talkd/README.sec
deleted file mode 100644
index cd17cc8..0000000
--- a/talkd/README.sec
+++ /dev/null
@@ -1,27 +0,0 @@
-CERT* Advisory CA-97.04
-
-Original issue date: January 27, 1997
-Last Revised: September 26, 1997
-Updated copyright statement 
-Description
-
-The CERT Coordination Center has received information of a vulnerability 
-in the talkd(8) program used by talk(1). talk is a communication program 
-that copies text from one user's terminal to that of another, possibly 
-remote, user. talkd is the daemon that notifies a user that someone else 
-wishes to initiate a talk conversation. 
-As part of the talk connection, talkd does a DNS lookup for the name of 
-the host that the connection is being initiated from. Because there is 
-insufficient bounds checking on the buffer where the hostname is stored, 
-it is possible to overwrite the internal stack space of talkd. 
-It is possible to force talkd to execute arbitrary commands by carefully 
-manipulating the hostname information. As talkd runs with root 
-privileges, this may allow intruders to remotely execute arbitrary 
-commands with these privileges. 
-This attack requires an intruder to be able to make a network connection 
-to a vulnerable talkd program and provide corrupt DNS information to 
-that host. 
-This type of attack is a particular instance of the problem described in 
-CERT advisory CA-96.04, "Corrupt Information from Network Servers," 
-available from 
----------------------------------------------------------------------
diff --git a/talkd/acl.c b/talkd/acl.c
index 27e09ba..309f440 100644
--- a/talkd/acl.c
+++ b/talkd/acl.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 #include <pwd.h>
diff --git a/talkd/announce.c b/talkd/announce.c
index b48c94e..7737d99 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -1,21 +1,22 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 #include <stdarg.h>
diff --git a/talkd/intalkd.h b/talkd/intalkd.h
index 9f0b16e..016a549 100644
--- a/talkd/intalkd.h
+++ b/talkd/intalkd.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/talkd/print.c b/talkd/print.c
index fa82712..43a5e49 100644
--- a/talkd/print.c
+++ b/talkd/print.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 
diff --git a/talkd/process.c b/talkd/process.c
index daabb97..a6497f6 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 #include <readutmp.h>
diff --git a/talkd/table.c b/talkd/table.c
index 359b188..2e45041 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 
diff --git a/talkd/talkd.c b/talkd/talkd.c
index edb1195..85b1008 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index bd94ee9..d98a5ed 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @telnet_BUILD@
 
diff --git a/telnet/README.sec b/telnet/README.sec
deleted file mode 100644
index a2b5067..0000000
--- a/telnet/README.sec
+++ /dev/null
@@ -1,31 +0,0 @@
-CERT* Advisory CA-95.14
-
-Original issue date: November 1, 1995
-Last revised: October 30, 1997 - Updated vendor information for Sun. 
-
-Description
-
-Some telnet daemons support RFC 1408 or RFC 1572, both titled "Telnet 
-Environment Option." This extension to telnet provides the ability to 
-transfer environment variables from one system to another. If the remote 
-or targeted system, the one to which the telnet is connecting, is 
-running an RFC 1408/RFC 1572-compliant telnet daemon *and* the targeted 
-system also supports shared object libraries, then it may be possible to 
-transfer environment variables that influence the login program called 
-by the telnet daemon. By influencing that targeted system, a user may be 
-able to bypass the normal login and authentication scheme and may become 
-root on that system. 
-
-Users with accounts on the targeted system can exploit this 
-vulnerability. Users without accounts on that system can also exploit 
-this vulnerability if they are first able to deposit an altered shared 
-object library onto the targeted system. Therefore, a system may be 
-vulnerable to users with and without local accounts. 
-
-Not all systems that run an RFC 1408/RFC 1572-compliant telnet daemon 
-and support shared object libraries are vulnerable. Some vendors have 
-changed the trust model such that environment variables provided by the 
-telnet daemon are not trusted and therefore are not used by the login 
-program. Section III contains a summary of information vendors have 
-reported as of the date of this advisory. 
---------------------------------------
diff --git a/telnet/authenc.c b/telnet/authenc.c
index 0f08fca..db2950b 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnet/commands.c b/telnet/commands.c
index 3c2404d..e1491b4 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/telnet/defines.h b/telnet/defines.h
index dee19cc..2b0a860 100644
--- a/telnet/defines.h
+++ b/telnet/defines.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *     @(#)defines.h   8.1 (Berkeley) 6/6/93
  */
 
 #define settimer(x)    clocks.x = clocks.system++
diff --git a/telnet/externs.h b/telnet/externs.h
index f98d796..8810558 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,30 +44,8 @@
  * 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.
- *
- *     @(#)externs.h   8.3 (Berkeley) 5/30/95
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #include <unistd.h>
 
 #ifndef BSD
diff --git a/telnet/fdset.h b/telnet/fdset.h
index 8055650..22e8970 100644
--- a/telnet/fdset.h
+++ b/telnet/fdset.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *     @(#)fdset.h     8.1 (Berkeley) 6/6/93
  */
 
 /*
diff --git a/telnet/general.h b/telnet/general.h
index 1d91428..7d1a0bf 100644
--- a/telnet/general.h
+++ b/telnet/general.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *     @(#)general.h   8.1 (Berkeley) 6/6/93
  */
 
 /*
diff --git a/telnet/krb4-proto.h b/telnet/krb4-proto.h
index 3afcb92..d4237d1 100644
--- a/telnet/krb4-proto.h
+++ b/telnet/krb4-proto.h
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 /* add_ticket.c */
 int add_ticket (KTEXT, int, char *, int, char *, char *, char *, int, KTEXT);
 
diff --git a/telnet/main.c b/telnet/main.c
index 536100e..fd2dddf 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,23 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; If not, see <http://www.gnu.org/licenses/>. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/telnet/network.c b/telnet/network.c
index f60b9bb..6a70772 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnet/ring.c b/telnet/ring.c
index 4f4956b..70f8d58 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnet/ring.h b/telnet/ring.h
index 31a8106..e7500e5 100644
--- a/telnet/ring.h
+++ b/telnet/ring.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,31 +44,8 @@
  * 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.
- *
- *     @(#)ring.h      8.1 (Berkeley) 6/6/93
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
-
 /*
  * This defines a structure for a ring buffer.
  *
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 8826d3f..f1a7f95 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnet/telnet.c b/telnet/telnet.c
index d16cd1d..54709df 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/telnet/terminal.c b/telnet/terminal.c
index d08d738..dc96c41 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index cb31f99..4afd957 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnet/types.h b/telnet/types.h
index 7d9ceb6..5704da3 100644
--- a/telnet/types.h
+++ b/telnet/types.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *     @(#)types.h     8.1 (Berkeley) 6/6/93
  */
 
 typedef struct
diff --git a/telnet/utilities.c b/telnet/utilities.c
index ef0a34b..46151fd 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 4784029..c048c48 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/telnetd/README.sec b/telnetd/README.sec
deleted file mode 100644
index dd6cb25..0000000
--- a/telnetd/README.sec
+++ /dev/null
@@ -1,11 +0,0 @@
-CERT* Advisory CA-95.03a
-
-Original issue date: March 3, 1995
-Last revised: September 23, 1997
-Updated copyright statement 
-
-Description
-
-There is a vulnerability in Berkeley Telnet clients that support 
-encryption and Kerberos V4 authentications. This vulnerability 
-substantially reduces the effectiveness of the encryption. 
diff --git a/telnetd/pty.c b/telnetd/pty.c
index 1050c7a..2835379 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -1,24 +1,25 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
+  Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "telnetd.h"
 #include <sys/wait.h>
+#include <pty.h>
 
 #ifdef AUTHENTICATION
 # include <libtelnet/auth.h>
diff --git a/telnetd/slc.c b/telnetd/slc.c
index 821d317..44764a3 100644
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -1,4 +1,24 @@
 /*
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnetd/state.c b/telnetd/state.c
index d4f5f3a..0e59456 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1,6 +1,26 @@
 /*
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1989, 1993
- *      The Regents of the University of California.  All rights reserved.
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 67acf71..1b840da 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 1998, 2001, 2002, 2004, 2006, 2007,
-   2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "telnetd.h"
 
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index cc23d45..a9f510d 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2005,2006,2007,2008 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/telnetd/term.c b/telnetd/term.c
index ccf34c7..223da38 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
+  Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <telnetd.h>
 
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 5fd4f2b..83d5b6f 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -1,4 +1,24 @@
 /*
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/telnetd/utility.c b/telnetd/utility.c
index da9ab68..58edcb6 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1,21 +1,22 @@
-/* Copyright (C) 1998,2001,2005,2006,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #define TELOPTS
 #define TELCMDS
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 541534c..cf615df 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 AM_CPPFLAGS = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib
 
diff --git a/tests/localhost.c b/tests/localhost.c
index 8ab3c63..14ca0bc 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -1,21 +1,20 @@
-/* Copyright (C) 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  This file is part of GNU Inetutils.
 
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
 
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "libinetutils.h"
 
diff --git a/tftp/Makefile.am b/tftp/Makefile.am
index 209dfe6..e5e8e05 100644
--- a/tftp/Makefile.am
+++ b/tftp/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/libinetutils 
-I$(top_srcdir)/lib -I../lib
 
diff --git a/tftp/extern.h b/tftp/extern.h
index 9616563..e654bef 100644
--- a/tftp/extern.h
+++ b/tftp/extern.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *     @(#)extern.h    8.1 (Berkeley) 6/6/93
  */
 
 void recvfile (int, char *, char *);
diff --git a/tftp/main.c b/tftp/main.c
index 26fb709..142d7fe 100644
--- a/tftp/main.c
+++ b/tftp/main.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/tftp/tftp.c b/tftp/tftp.c
index 8b6352d..daec4b3 100644
--- a/tftp/tftp.c
+++ b/tftp/tftp.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/tftpd/Makefile.am b/tftpd/Makefile.am
index fdadf17..356b950 100644
--- a/tftpd/Makefile.am
+++ b/tftpd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c
index 57fc9df..62258ec 100644
--- a/tftpd/tftpd.c
+++ b/tftpd/tftpd.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -27,23 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; If not, see <http://www.gnu.org/licenses/>. */
-
 /*
  * Trivial file transfer protocol server.
  *
diff --git a/traceroute/Makefile.am b/traceroute/Makefile.am
index db699dc..2ba94d0 100644
--- a/traceroute/Makefile.am
+++ b/traceroute/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @traceroute_BUILD@
 
@@ -22,8 +22,6 @@ EXTRA_PROGRAMS = traceroute
 
 traceroute_SOURCES = traceroute.c
 
-noinst_HEADERS = traceroute.h
-
 INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libicmp 
-I$(top_srcdir)/libinetutils
 
 LDADD = -L../libicmp -licmp -L../lib -lgnu
diff --git a/traceroute/traceroute.c b/traceroute/traceroute.c
index 2e5077d..ab40376 100644
--- a/traceroute/traceroute.c
+++ b/traceroute/traceroute.c
@@ -1,26 +1,22 @@
-/* Traceroute
-   
-   Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
-   
-   This file is part of GNU Inetutils.
-   
-   Written by Elian Gidoni.
-   
-   GNU Inetutils is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3 of the
-   License, or (at your option) any later version.
-   
-   GNU Inetutils is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
-*/
+/*
+  Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/* Written by Elian Gidoni.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -55,8 +51,36 @@
 #include <icmp.h>
 
 #include "libinetutils.h"
-#include "traceroute.h"
-
+
+#define TRACE_UDP_PORT 33434
+#define TRACE_TTL 1
+
+enum trace_type
+{
+  TRACE_UDP,                   /* UDP datagrams.  */
+  TRACE_ICMP,                  /* ICMP echo requests.  */
+  TRACE_1393                   /* RFC 1393 requests. */
+};
+
+typedef struct trace
+{
+  int icmpfd, udpfd;
+  enum trace_type type;
+  struct sockaddr_in to, from;
+  unsigned char ttl;
+  struct timeval tsent;
+} trace_t;
+
+void trace_init (trace_t * t, const struct sockaddr_in to,
+                const enum trace_type type);
+void trace_inc_ttl (trace_t * t);
+void trace_inc_port (trace_t * t);
+void trace_port (trace_t * t, const unsigned short port);
+int trace_read (trace_t * t);
+int trace_write (trace_t * t);
+int trace_udp_sock (trace_t * t);
+int trace_icmp_sock (trace_t * t);
+
 #define TIME_INTERVAL 3
 
 void do_try (trace_t * trace, const int hop,
diff --git a/traceroute/traceroute.h b/traceroute/traceroute.h
deleted file mode 100644
index e9ec8ed..0000000
--- a/traceroute/traceroute.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Traceroute
-   
-   Copyright (C) 2007 Free Software Foundation, Inc.
-   
-   This file is part of GNU Inetutils.
-   
-   Written by Elian Gidoni.
-   
-   GNU Inetutils is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3 of the
-   License, or (at your option) any later version.
-   
-   GNU Inetutils is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
-*/
-
-#ifndef TRACEROUTE_H
-#define TRACEROUTE_H 1
-
-#define TRACE_UDP_PORT 33434
-#define TRACE_TTL 1
-
-enum trace_type
-{
-  TRACE_UDP,                   /* UDP datagrams.  */
-  TRACE_ICMP,                  /* ICMP echo requests.  */
-  TRACE_1393                   /* RFC 1393 requests. */
-};
-
-typedef struct trace
-{
-  int icmpfd, udpfd;
-  enum trace_type type;
-  struct sockaddr_in to, from;
-  unsigned char ttl;
-  struct timeval tsent;
-} trace_t;
-
-void trace_init (trace_t * t, const struct sockaddr_in to,
-                const enum trace_type type);
-void trace_inc_ttl (trace_t * t);
-void trace_inc_port (trace_t * t);
-void trace_port (trace_t * t, const unsigned short port);
-int trace_read (trace_t * t);
-int trace_write (trace_t * t);
-int trace_udp_sock (trace_t * t);
-int trace_icmp_sock (trace_t * t);
-
-#endif /* TRACEROUTE_H */
diff --git a/uucpd/Makefile.am b/uucpd/Makefile.am
index 909cc69..7568ac6 100644
--- a/uucpd/Makefile.am
+++ b/uucpd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/uucpd/uucpd.c b/uucpd/uucpd.c
index 8e7d762..980614e 100644
--- a/uucpd/uucpd.c
+++ b/uucpd/uucpd.c
@@ -1,10 +1,27 @@
 /*
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Rick Adams.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -30,25 +47,8 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
-
-   This file is part of GNU Inetutils.
-
-   GNU Inetutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Inetutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+/* This code is derived from software contributed to Berkeley by Rick
+   Adams. */
 
 /*
  * 4.2BSD TCP/IP server for uucico
@@ -102,7 +102,6 @@
 #include <libinetutils.h>
 
 void dologin ();
-void usage (void);
 
 struct sockaddr_in hisctladdr;
 int hisaddrlen = sizeof hisctladdr;
@@ -127,13 +126,8 @@ static struct argp argp =
 int
 main (int argc, char **argv)
 {
-#ifndef BSDINETD
   register int s;
-# ifdef BSD4_2
-  register int tcp_socket;
-# endif
   struct servent *sp;
-#endif /* !BSDINETD */
   void dologout ();
 
   set_program_name (argv[0]);
@@ -141,23 +135,6 @@ main (int argc, char **argv)
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
 
   environ = nenv;
-#ifdef BSDINETD
-  close (1);
-  close (2);
-  dup (0);
-  dup (0);
-  hisaddrlen = sizeof (hisctladdr);
-  if (getpeername (0, &hisctladdr, &hisaddrlen) < 0)
-    {
-      fprintf (stderr, "%s: ", argv[0]);
-      perror ("getpeername");
-      _exit (1);
-    }
-  if (fork () == 0)
-    doit (&hisctladdr);
-  dologout ();
-  exit (1);
-#else /* !BSDINETD */
   sp = getservbyname ("uucp", "tcp");
   if (sp == NULL)
     {
@@ -175,49 +152,6 @@ main (int argc, char **argv)
   bzero ((char *) &myctladdr, sizeof (myctladdr));
   myctladdr.sin_family = AF_INET;
   myctladdr.sin_port = sp->s_port;
-# ifdef BSD4_2
-  tcp_socket = socket (AF_INET, SOCK_STREAM, 0);
-  if (tcp_socket < 0)
-    {
-      perror ("uucpd: socket");
-      exit (1);
-    }
-  if (bind (tcp_socket, (char *) &myctladdr, sizeof (myctladdr)) < 0)
-    {
-      perror ("uucpd: bind");
-      exit (1);
-    }
-  listen (tcp_socket, 3);      /* at most 3 simultaneuos uucp connections */
-  signal (SIGCHLD, dologout);
-
-  for (;;)
-    {
-      s = accept (tcp_socket, &hisctladdr, &hisaddrlen);
-      if (s < 0)
-       {
-         if (errno == EINTR)
-           continue;
-         perror ("uucpd: accept");
-         exit (1);
-       }
-      if (fork () == 0)
-       {
-         close (0);
-         close (1);
-         close (2);
-         dup (s);
-         dup (s);
-         dup (s);
-         close (tcp_socket);
-         close (s);
-         doit (&hisctladdr);
-         exit (1);
-       }
-      close (s);
-    }
-# endif        /* BSD4_2 */
-
-#endif /* !BSDINETD */
 }
 
 static int
@@ -288,21 +222,11 @@ doit (struct sockaddr_in *sinp)
   sprintf (Username, "USER=%s", user);
   dologin (pw, sinp);
   setgid (pw->pw_gid);
-#ifdef BSD4_2
-  initgroups (pw->pw_name, pw->pw_gid);
-#endif /* BSD4_2 */
   chdir (pw->pw_dir);
   setuid (pw->pw_uid);
-#ifdef BSD4_2
-  execl (UUCICO, "uucico", (char *) 0);
-#endif /* BSD4_2 */
   perror ("uucico server: execl");
 }
 
-#ifdef BSD4_2
-# include <fcntl.h>
-#endif /* BSD4_2 */
-
 void
 dologout ()
 {
@@ -350,7 +274,8 @@ dologin (struct passwd *pw, struct sockaddr_in *sin)
 
 #if defined (PATH_LASTLOG) && defined (HAVE_STRUCT_LASTLOG)
 # define SCPYN(a, b)   strncpy(a, b, sizeof (a))
-  if ((f = open (PATH_LASTLOG, O_RDWR)) >= 0)
+  f = open (PATH_LASTLOG, O_RDWR);
+  if (f >= 0)
     {
       struct lastlog ll;
 
@@ -364,16 +289,3 @@ dologin (struct passwd *pw, struct sockaddr_in *sin)
     }
 #endif
 }
-
-static const char usage_str[] =
-  "Usage: uucpd [OPTIONS...]\n"
-  "\n"
-  "Options are:\n"
-  "       --help              Display usage instructions\n"
-  "       --version           Display program version\n";
-
-void
-usage (void)
-{
-  printf ("%s\n" "Send bug reports to <%s>\n", usage_str, PACKAGE_BUGREPORT);
-}
diff --git a/gwhois/.gitignore b/whois/.gitignore
similarity index 100%
rename from gwhois/.gitignore
rename to whois/.gitignore
diff --git a/gwhois/Makefile.am b/whois/Makefile.am
similarity index 66%
rename from gwhois/Makefile.am
rename to whois/Makefile.am
index 8824e02..1190065 100644
--- a/gwhois/Makefile.am
+++ b/whois/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# GNU Inetutils is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# GNU Inetutils is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @whois_BUILD@
 
diff --git a/gwhois/as_del_list b/whois/as_del_list
similarity index 100%
rename from gwhois/as_del_list
rename to whois/as_del_list
diff --git a/gwhois/data.h b/whois/data.h
similarity index 75%
rename from gwhois/data.h
rename to whois/data.h
index f92de58..17a417d 100644
--- a/gwhois/data.h
+++ b/whois/data.h
@@ -1,4 +1,22 @@
 /*
+  Copyright (C) 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * RIPE-like servers.
  * All of them do not understand -V2.0Md with the exception of RA and RIPN.
  * 6bone-derived servers will accept the flag with a warning (the flag must
diff --git a/gwhois/ip_del_list b/whois/ip_del_list
similarity index 100%
rename from gwhois/ip_del_list
rename to whois/ip_del_list
diff --git a/gwhois/make_as_del.pl b/whois/make_as_del.pl
similarity index 99%
rename from gwhois/make_as_del.pl
rename to whois/make_as_del.pl
index 324d3d2..326dfde 100755
--- a/gwhois/make_as_del.pl
+++ b/whois/make_as_del.pl
@@ -17,4 +17,3 @@ while (<>) {
        }
        print "\" },\n";
 }
-
diff --git a/gwhois/make_ip_del.pl b/whois/make_ip_del.pl
similarity index 99%
rename from gwhois/make_ip_del.pl
rename to whois/make_ip_del.pl
index 91ca390..55ac8f5 100755
--- a/gwhois/make_ip_del.pl
+++ b/whois/make_ip_del.pl
@@ -19,4 +19,3 @@ while (<>) {
        }
        print "\" },\n";
 }
-
diff --git a/gwhois/make_tld_serv.pl b/whois/make_tld_serv.pl
similarity index 99%
rename from gwhois/make_tld_serv.pl
rename to whois/make_tld_serv.pl
index d2735d6..ec4a7e7 100755
--- a/gwhois/make_tld_serv.pl
+++ b/whois/make_tld_serv.pl
@@ -14,4 +14,3 @@ while (<>) {
        $b = "\\003" if ($b eq 'NONE');
        print "    \"$a\",\t\"$b\",\n";
 }
-
diff --git a/gwhois/tld_serv_list b/whois/tld_serv_list
similarity index 100%
rename from gwhois/tld_serv_list
rename to whois/tld_serv_list
diff --git a/gwhois/whois.c b/whois/whois.c
similarity index 95%
rename from gwhois/whois.c
rename to whois/whois.c
index 1c239bf..4c22793 100644
--- a/gwhois/whois.c
+++ b/whois/whois.c
@@ -1,22 +1,23 @@
 /*
-  Copyright (C) 1999, 2007, 2008, 2009 Free Software Foundation, Inc.
-  
-  Written by Marco d'Itri <address@hidden>.
-  
-  This program is free software; you can redistribute it and/or modify
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 3, or (at your option)
-  any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-  
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
   You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.  */
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/* Written by Marco d'Itri.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -136,7 +137,7 @@ static error_t
 gwhois_argp_parser (int key, char *arg, struct argp_state *state)
 {
   char *p, *q;
-  
+
   switch (key)
     {
     case 'h':
@@ -150,7 +151,7 @@ gwhois_argp_parser (int key, char *arg, struct argp_state 
*state)
     case 'H':
       hide_discl = 0;  /* enable disclaimers hiding */
       break;
-      
+
     case 'p':
       port = arg;
       break;
@@ -158,13 +159,13 @@ gwhois_argp_parser (int key, char *arg, struct argp_state 
*state)
     case 'V':
       verb = 1;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
   return 0;
 }
-      
+
 struct argp_child gwhois_argp_children[] = {
   { &ripe_argp,
     0,
@@ -195,9 +196,9 @@ main (int argc, char *argv[])
   char *fstring;
   char *qstring;
   char *p;
-  
+
   set_program_name (argv[0]);
-  
+
 #ifdef ENABLE_NLS
   setlocale (LC_MESSAGES, "");
   bindtextdomain (NLS_CAT_NAME, LOCALEDIR);
@@ -228,7 +229,7 @@ main (int argc, char *argv[])
     }
   obstack_1grow (&query_stk, 0);
   qstring = obstack_finish (&query_stk);
-  
+
   if (!server && domfind (qstring, gtlds))
     {
       if (verb)
@@ -386,12 +387,12 @@ is_ripe_server (const char * const *srvtab, const char 
*name)
   int isip = 0;
 
   isip = inet_aton (name, &addr);
-  
+
   for (; *srvtab; ++srvtab)
     {
       const char *server = *srvtab;
       struct hostent *hp;
-      
+
       if (strcmp (server, name) == 0)
        return 1;
       if (isip && (hp = gethostbyname (server)) != NULL)
diff --git a/gwhois/whois.h b/whois/whois.h
similarity index 67%
rename from gwhois/whois.h
rename to whois/whois.h
index e7a5153..172c1da 100644
--- a/gwhois/whois.h
+++ b/whois/whois.h
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
 #ifndef _WHOIS_H
 # define _WHOIS_H
 


hooks/post-receive
-- 
GNU Inetutils 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]