Copyright stamps everywhere. No code changes.

126 files changed, 568 insertions, 128 deletions

diff --git a/COPYING b/COPYING
index 841b0df2..8e8dd02e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,8 +1,10 @@
 			BSD LICENSE
 
-The GPSD code is Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by
-Remco Treffkorn. Portions of it are also Copyright (c) 2005 by Eric S. 
-Raymond. All rights reserved.
+Compilation copyright is held by the GPSD project.  All rights reserved.
+
+Portions of the GPSD code are Copyright (c) 1997, 1998, 1999, 2000,
+2001, 2002 by Remco Treffkorn. Portions of it are also Copyright (c)
+2005 by Eric S. Raymond. For other copyrights, see individual files.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
diff --git a/Makefile.am b/Makefile.am
index 33eba475..425486ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,8 @@
 # Automake description for gpsd
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # $Id$
 
 # Exclude Subversion state from the tarball.  Needed because we 
diff --git a/Tachometer.c b/Tachometer.c
index 69ec1340..01ffb8d1 100644
--- a/Tachometer.c
+++ b/Tachometer.c
@@ -6,6 +6,9 @@
  * Revised by Shinji Sumimoto, 1989/9 (xtachos)
  * Modifications : ilham@mit.edu   (July 10 '90)
  * Cleaned up and simplified by Eric S. Raymond, December 2004.
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 #include <sys/types.h>
 #include <X11/IntrinsicP.h>
diff --git a/Tachometer.h b/Tachometer.h
index dc77dd83..69c75e1d 100644
--- a/Tachometer.h
+++ b/Tachometer.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _GPSD_TACHOMETER_H_
 #define _GPSD_TACHOMETER_H_
 
diff --git a/TachometerP.h b/TachometerP.h
index 6feb6b83..8ea8592b 100644
--- a/TachometerP.h
+++ b/TachometerP.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _GPSD_TACHOMETERP_H_
 #define _GPSD_TACHOMETERP_H_
 
diff --git a/bits.c b/bits.c
index da125961..9d90790d 100644
--- a/bits.c
+++ b/bits.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Bitfield extraction functions.  In each, start is a bit index (not
  * a byte index) and width is a bit width.  The width bounded above by
  * the bit width of a long long, which is 64 bits in all standard data
diff --git a/bits.h b/bits.h
index 75de3a31..a2f2df0e 100644
--- a/bits.h
+++ b/bits.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _GPSD_BITS_H_
 #define _GPSD_BITS_H_
 
@@ -18,6 +22,9 @@
  *
  * The use of fixed-length types in the casts enforces these.
  * Both 32- and 64-bit systems with gcc are OK with this set.
+ *
+ * This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 
 #include <stdint.h>
diff --git a/bsd-base64.h b/bsd-base64.h
index 5e7d7ff3..9b1992b4 100644
--- a/bsd-base64.h
+++ b/bsd-base64.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _BSD_BASE64_H
 #define _BSD_BASE64_H
 
diff --git a/cgps.c b/cgps.c
index a71d5c41..91968d92 100644
--- a/cgps.c
+++ b/cgps.c
@@ -1,18 +1,7 @@
 /* $Id$ */
 /*
  * Copyright (c) 2005 Jeff Francis <jeff@gritch.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * BSD terms apply: see the filr COPYING in the distribution root for details.
  */
 
 /*
diff --git a/configure.ac b/configure.ac
index f992f3f5..50e7aaf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,7 @@
 dnl $Id$
+dnl This file is Copyright (c)2010 by the GPSD project
+dnl BSD terms apply: see the file COPYING in the distribution root for details.
+
 AC_INIT
 AM_INIT_AUTOMAKE(gpsd, 2.93dev)
 dnl AC_PREFIX_PROGRAM(gcc)
diff --git a/contrib/ashctl.c b/contrib/ashctl.c
index 6ec153d6..a2e39d44 100644
--- a/contrib/ashctl.c
+++ b/contrib/ashctl.c
@@ -1,4 +1,7 @@
-/* $Id$ */
+/* $Id$
+ * This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <err.h>
 #include <errno.h>
diff --git a/contrib/binlog.c b/contrib/binlog.c
index ac244734..965c3fa0 100644
--- a/contrib/binlog.c
+++ b/contrib/binlog.c
@@ -1,3 +1,6 @@
+/* This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <err.h>
 #include <errno.h>
diff --git a/contrib/binreplay.c b/contrib/binreplay.c
index f35b72ff..13738b88 100644
--- a/contrib/binreplay.c
+++ b/contrib/binreplay.c
@@ -1,3 +1,6 @@
+/* This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/contrib/lla2ecef.c b/contrib/lla2ecef.c
index 6340ab45..4ec12122 100644
--- a/contrib/lla2ecef.c
+++ b/contrib/lla2ecef.c
@@ -1,3 +1,6 @@
+/* This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/contrib/motosend.c b/contrib/motosend.c
index 351d2dcc..922206f3 100644
--- a/contrib/motosend.c
+++ b/contrib/motosend.c
@@ -1,4 +1,7 @@
-/* $Id$ */
+/* $Id$
+ * This file is Copyright (c)2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <machine/endian.h>
 #include <sys/limits.h>
diff --git a/crc24q.c b/crc24q.c
index 8b2e99e0..a741153f 100644
--- a/crc24q.c
+++ b/crc24q.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2008,2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * This is an implementation of the CRC-24Q cyclic redundancy checksum
  * used by Qualcomm, RTCM104V3, and PGP 6.5.1. According to the RTCM104V3
  * standard, it uses the error polynomial
@@ -24,9 +27,6 @@
  * Note that this version has a seed of 0 wired in.  The RTCM104V3 standard
  * requires this.
  *
- * This implementation by Eric Steven Raymond is Copyright (c) 2008
- * for the GPSD project, and is released under BSD terms.
- *
  */
 #include <stdbool.h>
 
diff --git a/crc24q.h b/crc24q.h
index 580221f3..49e6670c 100644
--- a/crc24q.h
+++ b/crc24q.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _CRC24Q_H_
 #define _CRC24Q_H_
 
diff --git a/driver_aivdm.c b/driver_aivdm.c
index d1aac545..78a593fe 100644
--- a/driver_aivdm.c
+++ b/driver_aivdm.c
@@ -1,5 +1,8 @@
 /* $Id$ */
 /*
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Driver for AIS/AIVDM messages.
  *
  * See the file AIVDM.txt on the GPSD website for documentation and references.
diff --git a/driver_evermore.c b/driver_evermore.c
index c39909a0..291185bf 100644
--- a/driver_evermore.c
+++ b/driver_evermore.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * This is the gpsd driver for EverMore GPSes operating in binary mode.
  * About the only thing this gives us that NMEA won't is TDOP.
  * But we'll get atomic position reports from it, which is good.
@@ -109,7 +112,6 @@
  * *10 *02 *04 *38 8d c5 *10 *03
  * 8d indicates that message 0x8d was sent;
  * c5 is EverMore checksum, other bytes are fixed
- *
  */
 
 #include <sys/types.h>
diff --git a/driver_garmin.c b/driver_garmin.c
index e6d3926e..3f2222be 100644
--- a/driver_garmin.c
+++ b/driver_garmin.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * This file contains two drivers for Garmin receivers and some code
  * shared by both drivers.
  *
@@ -53,7 +56,6 @@
  * sample code in the Linux garmin_gps driver.
  *
  * bad code by: Gary E. Miller <gem@rellim.com>
- * all rights abandoned, a thank would be nice if you use this code.
  *
  * -D 3 = packet trace
  * -D 4 = packet details
diff --git a/driver_garmin_txt.c b/driver_garmin_txt.c
index 99dbaa73..e0466fc1 100644
--- a/driver_garmin_txt.c
+++ b/driver_garmin_txt.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Handle the Garmin simple text format supported by some Garmins.
  * Tested with the 'Garmin eTrex Legend' device working in 'Text Out' mode.
  *
@@ -23,7 +26,6 @@
  *      vdop
  *	magnetic variation
  *      satellite information
- *
  */
 
 /***************************************************
diff --git a/driver_italk.c b/driver_italk.c
index 9c750558..3919a544 100644
--- a/driver_italk.c
+++ b/driver_italk.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Driver for the iTalk binary protocol used by FasTrax
  */
 #include <sys/types.h>
diff --git a/driver_italk.h b/driver_italk.h
index 1b76db49..a8792fe4 100644
--- a/driver_italk.h
+++ b/driver_italk.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _GPSD_ITALK_H_
 #define _GPSD_ITALK_H_
 
diff --git a/driver_navcom.c b/driver_navcom.c
index 68054540..23589f73 100644
--- a/driver_navcom.c
+++ b/driver_navcom.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Driver for Navcom receivers using propietary NCT messages, a binary protocol.
  *
  * Vendor website: http://www.navcomtech.com/
@@ -26,7 +29,6 @@
  * 0xef: Clock Drift and Offset
  *
  * By Diego Berge. Contact via web form at http://www.navlost.eu/contact
- *
  */
 
 #include <stdio.h>
diff --git a/driver_nmea.c b/driver_nmea.c
index c52622b8..69f28222 100644
--- a/driver_nmea.c
+++ b/driver_nmea.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <stdio.h>
 #ifndef S_SPLINT_S
diff --git a/driver_oncore.c b/driver_oncore.c
index 9715748d..890d447d 100644
--- a/driver_oncore.c
+++ b/driver_oncore.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/driver_proto.c b/driver_proto.c
index 7a781041..43298786 100644
--- a/driver_proto.c
+++ b/driver_proto.c
@@ -1,5 +1,8 @@
 /* $Id$
  *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * A prototype driver.  Doesn't run, doesn't even compile.
  *
  * For new driver authors: replace "_PROTO_" and "_proto_" with the name of
diff --git a/driver_rtcm2.c b/driver_rtcm2.c
index cd224692..2c6ab82f 100644
--- a/driver_rtcm2.c
+++ b/driver_rtcm2.c
@@ -1,6 +1,9 @@
 /* $Id$ */
 /*****************************************************************************
 
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+
 This is a decoder for RTCM-104 2.x, an obscure and complicated serial
 protocol used for broadcasting pseudorange corrections from
 differential-GPS reference stations.  The applicable
diff --git a/driver_rtcm2.h b/driver_rtcm2.h
index fe2fdfe4..f1481e6b 100644
--- a/driver_rtcm2.h
+++ b/driver_rtcm2.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _GPSD_RTCM2_H_
 #define _GPSD_RTCM2_H_
 
diff --git a/driver_rtcm3.c b/driver_rtcm3.c
index 5cc2ad6a..99795c9d 100644
--- a/driver_rtcm3.c
+++ b/driver_rtcm3.c
@@ -1,6 +1,9 @@
 /* $Id$ */
 /*****************************************************************************
 
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+
 This is a decoder for RTCM-104 3.x, a serial protocol used for
 broadcasting pseudorange corrections from differential-GPS reference
 stations.  The applicable specification is RTCM 10403.1: RTCM Paper
diff --git a/driver_sirf.c b/driver_sirf.c
index fb23950d..459b43e9 100644
--- a/driver_sirf.c
+++ b/driver_sirf.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * This is the gpsd driver for SiRF GPSes operating in binary mode.
  * It also handles uBlox, a SiRF derivative.
  *
diff --git a/driver_superstar2.c b/driver_superstar2.c
index f94f8e04..6daa25b5 100644
--- a/driver_superstar2.c
+++ b/driver_superstar2.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/driver_superstar2.h b/driver_superstar2.h
index 8b1529ca..29031a70 100644
--- a/driver_superstar2.h
+++ b/driver_superstar2.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _GPSD_SUPERSTAR2_H_
 #define _GPSD_SUPERSTAR2_H_
 
diff --git a/driver_tsip.c b/driver_tsip.c
index ab91725c..2220a80a 100644
--- a/driver_tsip.c
+++ b/driver_tsip.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Handle the Trimble TSIP packet format
  * by Rob Janssen, PE1CHL.
  */
diff --git a/driver_ubx.c b/driver_ubx.c
index b37a7ecd..037de270 100644
--- a/driver_ubx.c
+++ b/driver_ubx.c
@@ -1,5 +1,8 @@
 /* $Id$
  *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * UBX driver
  */
 
diff --git a/driver_ubx.h b/driver_ubx.h
index fbf08206..22dd15f2 100644
--- a/driver_ubx.h
+++ b/driver_ubx.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details
+ */
 #ifndef _GPSD_UBX_H_
 #define _GPSD_UBX_H_
 
diff --git a/driver_zodiac.c b/driver_zodiac.c
index 71b8f59c..27c8b733 100644
--- a/driver_zodiac.c
+++ b/driver_zodiac.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Handle the Rockwell binary packet format supported by the old Zodiac chipset
  */
 #include <sys/types.h>
diff --git a/drivers.c b/drivers.c
index b59032b5..c089e5c4 100644
--- a/drivers.c
+++ b/drivers.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include "gpsd_config.h"
 #ifdef HAVE_SYS_IOCTL_H
diff --git a/geoid.c b/geoid.c
index 5db3ca68..cf63592b 100644
--- a/geoid.c
+++ b/geoid.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/* 
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ * 
  * geoid.c -- ECEF to WGS84 conversions, including ellipsoid-to-MSL height
  *
  * Geoid separation code by Oleg Gusev, from data by Peter Dana.
diff --git a/gps.h b/gps.h
index 5ad4b5be..d2093dfc 100644
--- a/gps.h
+++ b/gps.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _GPSD_GPS_H_
 #define _GPSD_GPS_H_
 
diff --git a/gps.xml b/gps.xml
index 2643507f..7a9d6221 100644
--- a/gps.xml
+++ b/gps.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/gps/__init__.py b/gps/__init__.py
index c0188381..2255cab2 100644
--- a/gps/__init__.py
+++ b/gps/__init__.py
@@ -1,4 +1,8 @@
 # Make core client functions available without prefix.
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+
 from gps import *
 
 # The 'client' module exposes some C utility functions for Python clients.
diff --git a/gps/fake.py b/gps/fake.py
index 9d75a96f..ab448cb9 100644
--- a/gps/fake.py
+++ b/gps/fake.py
@@ -1,6 +1,9 @@
 """
 $Id$
 
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+
 gpsfake.py -- classes for creating a controlled test environment around gpsd.
 
 The gpsfake(1) regression tester shipped with gpsd is a trivial wrapper
diff --git a/gps/gps.py b/gps/gps.py
index fe5f7906..9029b46c 100755
--- a/gps/gps.py
+++ b/gps/gps.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # $Id$
 #
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # gps.py -- Python interface to GPSD.
 #
 import time, calendar, math, socket, sys, select
diff --git a/gps_json.h b/gps_json.h
index 74547d5a..8c8489a4 100644
--- a/gps_json.h
+++ b/gps_json.h
@@ -1,4 +1,9 @@
-/* gps_json.h - JSON handling for libgps and gpsd */
+/* gps_json.h - JSON handling for libgps and gpsd
+ *
+ * By Eric S. Raymond, 2009
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 
 #include "json.h"
 
diff --git a/gpscap.ini b/gpscap.ini
index 2c21a816..878100a2 100644
--- a/gpscap.ini
+++ b/gpscap.ini
@@ -1,5 +1,8 @@
 # GPS capability description file
 #
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # Our apologies to all Unix hackers in advance for the grubby .INI syntax,
 # we're using it because the format has good cross-Unix support in Python.
 #
diff --git a/gpscap.py b/gpscap.py
index ff5ca2e5..950284a1 100644
--- a/gpscap.py
+++ b/gpscap.py
@@ -2,6 +2,8 @@
 
 gpscap - GPS/AIS capability dictionary class.
 
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
 """
 import ConfigParser
 
diff --git a/gpscat.in b/gpscat.in
index 8c45c03c..d96a1ffd 100644
--- a/gpscat.in
+++ b/gpscat.in
@@ -1,5 +1,8 @@
 #!@PYTHON@
 #
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # Display GPS output.  Hexify it if necessary.
 #
 import os, sys, termios, select, getopt, curses.ascii
diff --git a/gpscat.xml b/gpscat.xml
index cbd59606..7ca9b818 100644
--- a/gpscat.xml
+++ b/gpscat.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/gpsclient.c b/gpsclient.c
index 128bd5e6..b8d234b0 100644
--- a/gpsclient.c
+++ b/gpsclient.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Python binding for selected libgps library functions
  */
 #include <Python.h>
diff --git a/gpsctl.c b/gpsctl.c
index 49c2f0d0..475f92b3 100644
--- a/gpsctl.c
+++ b/gpsctl.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * gpsctl.c -- tweak the control settings on a GPS
  */
 #include <stdio.h>
diff --git a/gpsctl.xml b/gpsctl.xml
index d2cc6a77..2c6ff888 100644
--- a/gpsctl.xml
+++ b/gpsctl.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/gpsd.c b/gpsd.c
index e5f14694..a399e721 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1,4 +1,11 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
+ * This is the main sequence of the gpsd daemon. The IO dos[atcher, main 
+ * select loop, and user command handling lives here. 
+ */
 #include <stdlib.h>
 #include "gpsd_config.h"
 #include <sys/types.h>
diff --git a/gpsd.h-head b/gpsd.h-head
index f9d00654..912eec7d 100644
--- a/gpsd.h-head
+++ b/gpsd.h-head
@@ -1,4 +1,8 @@
-/* gpsd.h -- fundamental types and structures for the gpsd library */
+/* gpsd.h -- fundamental types and structures for the gpsd library
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 
 /* $Id$ */
 #ifndef _GPSD_H_
diff --git a/gpsd.h-tail b/gpsd.h-tail
index 650bd82d..10133e58 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -1,4 +1,8 @@
-/* Feature configuration switches end here */
+/* Feature configuration switches end here
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #endif /* GPSD_CONFIG_H */
 
 /* $Id$ */
diff --git a/gpsd.hotplug b/gpsd.hotplug
index f8823798..6b9fbeb0 100755
--- a/gpsd.hotplug
+++ b/gpsd.hotplug
@@ -1,5 +1,9 @@
 #!/usr/bin/python
 # $Id$
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # Hotplug script for gpsd by Eric S. Raymond, March 2005
 # This script is part of the gpsd distribution: see http://gpsd.berlios.de
 # Can be called like "gpsd.hotplug [add|remove] /dev/ttyUSB0" for test
diff --git a/gpsd.hotplug.wrapper b/gpsd.hotplug.wrapper
index f589d0fe..4be45663 100644
--- a/gpsd.hotplug.wrapper
+++ b/gpsd.hotplug.wrapper
@@ -1,5 +1,8 @@
 #!/bin/sh
 # $Id$
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
 
 if [ -r /etc/default/gpsd ]; then
   . /etc/default/gpsd
diff --git a/gpsd.rules b/gpsd.rules
index 20343e3c..3680e577 100644
--- a/gpsd.rules
+++ b/gpsd.rules
@@ -1,6 +1,9 @@
 # udev rules for gpsd
 # $Id$
 #
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # GPSes don't have their own USB device class.  They're serial-over-USB
 # devices, so what you see is actually the ID of the serial-over-USB chip.
 # Fortunately, just two of these account for over 80% of consumer-grade
diff --git a/gpsd.usermap b/gpsd.usermap
index 244f9f3f..4566cea8 100644
--- a/gpsd.usermap
+++ b/gpsd.usermap
@@ -1,6 +1,9 @@
 # Hotplug device map for GPSD
 # $Id$
 #
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # GPSes don't have their own USB device class.  They're serial-over-USB 
 # devices, so what you see is actually the ID of the serial-over-USB chip.
 # Fortunately, just two of these account for over 80% of consumer-grade 
diff --git a/gpsd.xml b/gpsd.xml
index 42ac19bb..55e2f3f7 100644
--- a/gpsd.xml
+++ b/gpsd.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
diff --git a/gpsd_dbus.c b/gpsd_dbus.c
index 768ec1ea..747369ec 100644
--- a/gpsd_dbus.c
+++ b/gpsd_dbus.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <stdio.h>
 #include "gpsd_config.h"
diff --git a/gpsd_dbus.h b/gpsd_dbus.h
index 92f64457..933b1db1 100644
--- a/gpsd_dbus.h
+++ b/gpsd_dbus.h
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef _GPSD_DBUS_H_
 #define _GPSD_DBUS_H_
 
diff --git a/gpsd_json.c b/gpsd_json.c
index 8edd3848..d8f9d5ba 100644
--- a/gpsd_json.c
+++ b/gpsd_json.c
@@ -7,6 +7,11 @@ DESCRIPTION
    This module uses the generic JSON parser to get data from JSON
 representations to gpsd core strctures, and vice_versa.
 
+PERMISSIONS
+  Written by Eric S. Raymond, 2009
+  This file is Copyright (c) 2010 by the GPSD project
+  BSD terms apply: see the file COPYING in the distribution root for details.
+
 ***************************************************************************/
 
 #include <math.h>
diff --git a/gpsd_report.c b/gpsd_report.c
index 74a00fa6..ef38878d 100644
--- a/gpsd_report.c
+++ b/gpsd_report.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/gpsdclient.c b/gpsdclient.c
index a67db7b2..8c8e4b3a 100644
--- a/gpsdclient.c
+++ b/gpsdclient.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* gpsclient.c -- support functions for GPSD clients */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
+ * gpsdclient.c -- support functions for GPSD clients
+ */
 #include <sys/time.h>
 #include <stdio.h>
 #ifndef S_SPLINT_S
diff --git a/gpsdclient.h b/gpsdclient.h
index fb3fe0c5..50d14345 100644
--- a/gpsdclient.h
+++ b/gpsdclient.h
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* gpsdclient.h -- common functions for GPSD clients */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
+ * gpsdclient.h -- common functions for GPSD clients
+ */
 
 #ifndef _GPSD_GPSDCLIENT_H_
 #define _GPSD_GPSDCLIENT_H_
diff --git a/gpsdecode.c b/gpsdecode.c
index 7ac3bca5..ec270817 100644
--- a/gpsdecode.c
+++ b/gpsdecode.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
diff --git a/gpsdecode.xml b/gpsdecode.xml
index bf249a5b..34643eb1 100644
--- a/gpsdecode.xml
+++ b/gpsdecode.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/gpsfake.in b/gpsfake.in
index 1c31826b..515a4835 100644
--- a/gpsfake.in
+++ b/gpsfake.in
@@ -5,6 +5,9 @@
 # Simulates a GPS, playing back a logfile
 # Most of the logic for this now lives in gps.fake,
 # factored out so we can write other test programs with it.
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
 
 import sys, os, signal, time, getopt, socket
 import gps.fake
diff --git a/gpsfake.xml b/gpsfake.xml
index f951b672..3a1143f0 100644
--- a/gpsfake.xml
+++ b/gpsfake.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/gpsmon.c b/gpsmon.c
index 1288eae9..3fa895ac 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * The generic GPS packet monitor.
  */
 #include <sys/types.h>
diff --git a/gpsmon.h b/gpsmon.h
index 99078380..09b5f5c3 100644
--- a/gpsmon.h
+++ b/gpsmon.h
@@ -1,5 +1,11 @@
-/* $Id$ */
-/* gpsmon.h -- what monitor capabuilities look like */
+/* gpsmon.h -- what monitor capabuilities look like
+ *
+ * $Id$
+ *
+ * By Eric S. Raymond, 2009
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 
 #ifndef _GPSD_GPSMON_H_
 #define _GPSD_GPSMON_H_
diff --git a/gpsmon.xml b/gpsmon.xml
index 5be3c193..9123442d 100644
--- a/gpsmon.xml
+++ b/gpsmon.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/gpspacket.c b/gpspacket.c
index 76b3e19b..1dc5b31f 100644
--- a/gpspacket.c
+++ b/gpspacket.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * Python binding for the packet.c module.
  */
 #include <Python.h>
diff --git a/gpspipe.c b/gpspipe.c
index d68a062a..6481ebaf 100644
--- a/gpspipe.c
+++ b/gpspipe.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * gpspipe
  *
  * a simple program to connect to a gpsd daemon and dump the received data
diff --git a/gpspipe.xml b/gpspipe.xml
index c4eec026..68f27f99 100644
--- a/gpspipe.xml
+++ b/gpspipe.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/gpsprof.in b/gpsprof.in
index cabe9574..39a03b2f 100644
--- a/gpsprof.in
+++ b/gpsprof.in
@@ -1,5 +1,8 @@
 #!@PYTHON@
 #
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # Collect and plot latency-profiling data from a running gpsd.
 # Requires gnuplot.
 #
diff --git a/gpsprof.xml b/gpsprof.xml
index 7deab219..34590f6e 100644
--- a/gpsprof.xml
+++ b/gpsprof.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/gpssim.py b/gpssim.py
index 64dd9180..1b4219e3 100644
--- a/gpssim.py
+++ b/gpssim.py
@@ -1,4 +1,7 @@
 # $Id$
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
 """
 A GPS simulator.
 
diff --git a/gpsutils.c b/gpsutils.c
index 0797a705..9a291718 100644
--- a/gpsutils.c
+++ b/gpsutils.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* gpsutils.c -- code shared between low-level and high-level interfaces */
+/* gpsutils.c -- code shared between low-level and high-level interfaces
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <stdio.h>
 #ifndef S_SPLINT_S
diff --git a/gpxlogger.c b/gpxlogger.c
index 2e4d1628..a7f644ef 100644
--- a/gpxlogger.c
+++ b/gpxlogger.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdlib.h>
 #include "gpsd_config.h"
 #include <sys/types.h>
diff --git a/hex.c b/hex.c
index 61b95d34..a6b12993 100644
--- a/hex.c
+++ b/hex.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
diff --git a/isgps.c b/isgps.c
index 7b7bbcb1..94cdbb59 100644
--- a/isgps.c
+++ b/isgps.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 /*****************************************************************************
 
 This is a decoder for the unnamed protocol described in IS-GPS-200,
diff --git a/json.c b/json.c
index b5902891..83ebdc89 100644
--- a/json.c
+++ b/json.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 /****************************************************************************
 
 NAME
diff --git a/json.h b/json.h
index 5bd85a42..26e7d982 100644
--- a/json.h
+++ b/json.h
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* Structures for JSON parsing using only fixed-extent memory */
+/* Structures for JSON parsing using only fixed-extent memory
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 
 #include <stdbool.h>
 #include <ctype.h>
diff --git a/jsongen.py.in b/jsongen.py.in
index 2bd2610f..56361b7a 100644
--- a/jsongen.py.in
+++ b/jsongen.py.in
@@ -1,5 +1,8 @@
 #!@PYTHON@
 #
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # Never hand-hack what you can generate...
 #
 # This code generates template declarations for AIS-JSON parsing from a
diff --git a/libgps.xml b/libgps.xml
index 967a1028..021a3f65 100644
--- a/libgps.xml
+++ b/libgps.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <!-- lifted from troff+man by doclifter -->
diff --git a/libgps_core.c b/libgps_core.c
index cbc576bc..1030ed5d 100644
--- a/libgps_core.c
+++ b/libgps_core.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* libgps.c -- client interface library for the gpsd daemon */
+/* libgps.c -- client interface library for the gpsd daemon
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/time.h>
 #include <stdio.h>
 #ifndef S_SPLINT_S
diff --git a/libgps_json.c b/libgps_json.c
index 6f37d616..6ebfdf86 100644
--- a/libgps_json.c
+++ b/libgps_json.c
@@ -7,6 +7,11 @@ DESCRIPTION
    This module uses the generic JSON parser to get data from JSON
 representations to libgps structures.
 
+PERMISSIONS
+   Written by Eric S. Raymond, 2009
+   This file is Copyright (c) 2010 by the GPSD project
+   BSD terms apply: see the file COPYING in the distribution root for details.
+
 ***************************************************************************/
 
 #include <math.h>
diff --git a/libgpsd.xml b/libgpsd.xml
index 57156526..048287f8 100644
--- a/libgpsd.xml
+++ b/libgpsd.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <refentry>
diff --git a/libgpsd_core.c b/libgpsd_core.c
index 0a79c6d4..bd1aabd1 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* libgpsd_core.c -- direct access to GPSes on serial or USB devices. */
+/* libgpsd_core.c -- direct access to GPSes on serial or USB devices.
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdlib.h>
 #include "gpsd_config.h"
 #include <sys/time.h>
diff --git a/libgpsmm.cpp b/libgpsmm.cpp
index f96d7293..f505efd9 100644
--- a/libgpsmm.cpp
+++ b/libgpsmm.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2005 Alfredo Pironti
  *
  * This software is distributed under a BSD-style license. See the
- * file "COPYING" for more information.
+ * file "COPYING" in the top-level directory of the disribution for details.
  *
  */
 #include <cstdlib>
diff --git a/libgpsmm.h b/libgpsmm.h
index bf3d9919..d51fe532 100644
--- a/libgpsmm.h
+++ b/libgpsmm.h
@@ -6,7 +6,7 @@
  * Copyright (C) 2005 Alfredo Pironti
  *
  * This software is distributed under a BSD-style license. See the
- * file "COPYING" for more information.
+ * file "COPYING" in the toop-level directory of the distribution for details.
  *
  */
 #include <sys/types.h>
diff --git a/libgpsmm.xml b/libgpsmm.xml
index 0ee39a15..7732bbd4 100644
--- a/libgpsmm.xml
+++ b/libgpsmm.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <!-- lifted from troff+man by doclifter -->
diff --git a/maskaudit.py.in b/maskaudit.py.in
index 869604d1..fbbbc004 100644
--- a/maskaudit.py.in
+++ b/maskaudit.py.in
@@ -1,5 +1,8 @@
 #!@PYTHON@
 #
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # With -t, report on which status masks are used in the daemon vs. the
 # client-side library.
 #
diff --git a/monitor_italk.c b/monitor_italk.c
index 09d6f996..478e3d24 100644
--- a/monitor_italk.c
+++ b/monitor_italk.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/monitor_nmea.c b/monitor_nmea.c
index 9b14a5cf..51e35d45 100644
--- a/monitor_nmea.c
+++ b/monitor_nmea.c
@@ -4,6 +4,9 @@
  *
  * To do: Support for GPGLL, GPRME, GPZDA, OHPR, PASHR NMEA sentences.
  * Support for Tripmate, Earthmate, True North and Oceanserver devices.
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/monitor_oncore.c b/monitor_oncore.c
index 776291ee..b9e08e36 100644
--- a/monitor_oncore.c
+++ b/monitor_oncore.c
@@ -1,6 +1,9 @@
 /* $Id$ */
 /*
  * OnCore object for the GPS packet monitor.
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/monitor_proto.c b/monitor_proto.c
index 21e43a38..08c78ae3 100644
--- a/monitor_proto.c
+++ b/monitor_proto.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 /*
  * Prototype file for a gpsmon monitor object.  
  */
diff --git a/monitor_sirf.c b/monitor_sirf.c
index 0c012772..9e0f5df7 100644
--- a/monitor_sirf.c
+++ b/monitor_sirf.c
@@ -1,5 +1,8 @@
-/* $Id$ */
-/*
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ *
  * SiRF object for the GPS packet monitor.
  *
  */
diff --git a/monitor_superstar2.c b/monitor_superstar2.c
index bf9d4ed6..54582129 100644
--- a/monitor_superstar2.c
+++ b/monitor_superstar2.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/monitor_ubx.c b/monitor_ubx.c
index 6d32d05e..c3543559 100644
--- a/monitor_ubx.c
+++ b/monitor_ubx.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/net_dgpsip.c b/net_dgpsip.c
index 94f2de4f..8c27cb30 100644
--- a/net_dgpsip.c
+++ b/net_dgpsip.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* net_dgpsip.c -- gather and dispatch DGPS data from DGPSIP servers */
+/* net_dgpsip.c -- gather and dispatch DGPS data from DGPSIP servers
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdlib.h>
 #include "gpsd_config.h"
 #include <sys/types.h>
diff --git a/net_gnss_dispatch.c b/net_gnss_dispatch.c
index cb2970e2..58ece1c6 100644
--- a/net_gnss_dispatch.c
+++ b/net_gnss_dispatch.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* net_gnss_dispatch.c -- common interface to a number of Network GNSS services */
+/* net_gnss_dispatch.c -- common interface to a number of Network GNSS services
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 
 #include <stdlib.h>
 #include "gpsd_config.h"
diff --git a/net_ntrip.c b/net_ntrip.c
index cc4cfc55..526bd181 100644
--- a/net_ntrip.c
+++ b/net_ntrip.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* net_ntrip.c -- gather and dispatch DGNSS data from Ntrip broadcasters */
+/* net_ntrip.c -- gather and dispatch DGNSS data from Ntrip broadcasters
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdlib.h>
 #include "gpsd_config.h"
 #include <sys/types.h>
diff --git a/netlib.c b/netlib.c
index bdccdf52..3730c0fe 100644
--- a/netlib.c
+++ b/netlib.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 
 #include "gpsd_config.h"
diff --git a/ntpshm.c b/ntpshm.c
index 21434611..5fae6bb4 100644
--- a/ntpshm.c
+++ b/ntpshm.c
@@ -3,6 +3,9 @@
  * ntpshm.c - put time information in SHM segment for xntpd
  * struct shmTime and getShmTime from file in the xntp distribution:
  *	sht.c - Testprogram for shared memory refclock
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 
 #include <stdlib.h>
diff --git a/packet.c b/packet.c
index 571b5a85..c8486f6e 100644
--- a/packet.c
+++ b/packet.c
@@ -23,6 +23,10 @@ No need to handle Garmin USB binary, we know that type by the fact we're
 connected to the Garmin kernel driver.  But we need to be able to tell the
 others apart and distinguish them from baud barf.
 
+PERMISSIONS
+   This file is Copyright (c) 2010 by the GPSD project
+   BSD terms apply: see the file COPYING in the distribution root for details.
+
 ***************************************************************************/
 #include <stdlib.h>
 #include "gpsd_config.h"
diff --git a/pseudonmea.c b/pseudonmea.c
index dcc1f0ba..5de07257 100644
--- a/pseudonmea.c
+++ b/pseudonmea.c
@@ -1,3 +1,8 @@
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdlib.h>
 #include "gpsd_config.h"
 #include <sys/time.h>
diff --git a/rtcm-104.xml b/rtcm-104.xml
index 1926a6ae..1b9ed919 100644
--- a/rtcm-104.xml
+++ b/rtcm-104.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/rtcm2_json.c b/rtcm2_json.c
index d796948d..6d73f7dc 100644
--- a/rtcm2_json.c
+++ b/rtcm2_json.c
@@ -7,6 +7,10 @@ DESCRIPTION
    This module uses the generic JSON parser to get data from RTCM2
 representations to libgps structures.
 
+PERMISSIONS
+   This file is Copyright (c) 2010 by the GPSD project
+   BSD terms apply: see the file COPYING in the distribution root for details.
+
 ***************************************************************************/
 
 #include <math.h>
diff --git a/serial.c b/serial.c
index 1e9f666b..c86d0833 100644
--- a/serial.c
+++ b/serial.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef S_SPLINT_S
diff --git a/setup.py b/setup.py
index 5cd4fc3e..773295a3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,8 @@
 # $Id$
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
+#
 # Creates build/lib.linux-${arch}-${pyvers}/gpspacket.so,
 # where ${arch} is an architecture and ${pyvers} is a Python version.
 
diff --git a/srec.xml b/srec.xml
index a3997265..e21ad443 100644
--- a/srec.xml
+++ b/srec.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+This file is Copyright (c) 2010 by the GPSD project
+BSD terms apply: see the file COPYING in the distribution root for -details.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
diff --git a/strl.c b/strl.c
index bb47eea1..baca1fcf 100644
--- a/strl.c
+++ b/strl.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdio.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
diff --git a/subframe.c b/subframe.c
index fd7f60ae..c4ada36f 100644
--- a/subframe.c
+++ b/subframe.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* subframe.c -- interpret satellite subframe data. */
+/* subframe.c -- interpret satellite subframe data.
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <sys/types.h>
 
 #include "gpsd.h"
diff --git a/test_bits.c b/test_bits.c
index 94209279..66ce6c62 100644
--- a/test_bits.c
+++ b/test_bits.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* test harness for bits.h */
+/* test harness for bits.h
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test_float.c b/test_float.c
index 37f27ae6..b4043860 100644
--- a/test_float.c
+++ b/test_float.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdio.h>
 
 /*
diff --git a/test_geoid.c b/test_geoid.c
index c3566689..4347e5da 100644
--- a/test_geoid.c
+++ b/test_geoid.c
@@ -1,7 +1,9 @@
-/* $Id$ */
-/* 
- * test driver for the ECEF to WGS84 conversions in geoid.c
+/* test driver for the ECEF to WGS84 conversions in geoid.c
  *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details. 
  */
 
 #include <sys/types.h>
diff --git a/test_gpsmm.cpp b/test_gpsmm.cpp
index a6219ba7..22dc9273 100644
--- a/test_gpsmm.cpp
+++ b/test_gpsmm.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2005 Alfredo Pironti
  *
  * This software is distributed under a BSD-style license. See the
- * file "COPYING" for more information.
+ * file "COPYING" in the top-level directory of the distribution for details.
  *
  */
 
diff --git a/test_json.c b/test_json.c
index dfba3075..76a290c1 100644
--- a/test_json.c
+++ b/test_json.c
@@ -1,5 +1,10 @@
-/* $Id$ */
-/* json.c - unit test for JSON partsing into fixed-extent structures */
+/* json.c - unit test for JSON partsing into fixed-extent structures
+ *
+ * $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test_mkgmtime.c b/test_mkgmtime.c
index 916086c5..c269e32f 100644
--- a/test_mkgmtime.c
+++ b/test_mkgmtime.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test_packet.c b/test_packet.c
index 30decee6..814e1c7c 100644
--- a/test_packet.c
+++ b/test_packet.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/* $Id$
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
diff --git a/valgrind-audit.in b/valgrind-audit.in
index 43a191c9..044c013d 100644
--- a/valgrind-audit.in
+++ b/valgrind-audit.in
@@ -1,6 +1,9 @@
 #!@PYTHON@
 #
-# This is a valgrind torture test for the daemon.
+# This is a valgrind torture test for the gpsd daemon.
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
 #
 import sys, gpsfake 
 
diff --git a/xgps b/xgps
index 3a89ea61..c34bbb8e 100755
--- a/xgps
+++ b/xgps
@@ -10,6 +10,9 @@ This is xgps, a test client for the gpsd daemon.
 
 By Eric S. Raymond for the GPSD project, December 2009
 '''
+#
+# This file is Copyright (c) 2010 by the GPSD project
+# BSD terms apply: see the file COPYING in the distribution root for details.
 
 import sys, os, re, math, time, exceptions, getopt, socket
 
diff --git a/xgpsspeed.c b/xgpsspeed.c
index 3c7b7686..d3cb39bb 100644
--- a/xgpsspeed.c
+++ b/xgpsspeed.c
@@ -1,6 +1,9 @@
 /* $Id$ */
 /* GPS speedometer as a wrapper around an Athena widget Tachometer
  * - Derrick J Brashear <shadow@dementia.org>
+ *
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 #include <sys/types.h>
 #include <stdlib.h>