diff --git a/tools/hcidump.c b/tools/hcidump.c
index bd2e073..f6b1f40 100644
--- a/tools/hcidump.c
+++ b/tools/hcidump.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - HCI sniffer
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2000-2002  Maxim Krasnyansky <maxk@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,10 +18,8 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/tools/parser/avdtp.c b/tools/parser/avdtp.c
index aa1003b..c7ee953 100644
--- a/tools/parser/avdtp.c
+++ b/tools/parser/avdtp.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - AVDTP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2004-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,16 +17,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/bnep.c b/tools/parser/bnep.c
index de0af7a..ea85498 100644
--- a/tools/parser/bnep.c
+++ b/tools/parser/bnep.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - BNEP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2002-2003  Takashi Sasai <sasai@sm.sony.co.jp>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,16 +18,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/bpa.c b/tools/parser/bpa.c
index f58f409..a5eb307 100644
--- a/tools/parser/bpa.c
+++ b/tools/parser/bpa.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - BPA parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2004-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,16 +17,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/capi.c b/tools/parser/capi.c
index 1e26365..3c67a94 100644
--- a/tools/parser/capi.c
+++ b/tools/parser/capi.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - CAPI parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2004-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,17 +17,19 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/cmtp.c b/tools/parser/cmtp.c
index 6af45bf..798c672 100644
--- a/tools/parser/cmtp.c
+++ b/tools/parser/cmtp.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - CMTP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2002-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,16 +17,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/csr.c b/tools/parser/csr.c
index d99f37e..a9392d5 100644
--- a/tools/parser/csr.c
+++ b/tools/parser/csr.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - CSR parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2004-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,16 +17,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/hci.c b/tools/parser/hci.c
index a651930..ae48f77 100644
--- a/tools/parser/hci.c
+++ b/tools/parser/hci.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - HCI parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2000-2002  Maxim Krasnyansky <maxk@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,17 +18,19 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/hcrp.c b/tools/parser/hcrp.c
index 8f50c22..f127b5d 100644
--- a/tools/parser/hcrp.c
+++ b/tools/parser/hcrp.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - HCRP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2004-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,16 +17,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/hidp.c b/tools/parser/hidp.c
index 919665a..22187a5 100644
--- a/tools/parser/hidp.c
+++ b/tools/parser/hidp.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - HIDP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,16 +17,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/l2cap.c b/tools/parser/l2cap.c
index 38adc59..b7425cf 100644
--- a/tools/parser/l2cap.c
+++ b/tools/parser/l2cap.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - L2CAP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2000-2002  Maxim Krasnyansky <maxk@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,16 +18,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/lmp.c b/tools/parser/lmp.c
index 514d282..96cd961 100644
--- a/tools/parser/lmp.c
+++ b/tools/parser/lmp.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - LMP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2004-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,12 +17,14 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
diff --git a/tools/parser/obex.c b/tools/parser/obex.c
index 2e5ee43..758cea2 100644
--- a/tools/parser/obex.c
+++ b/tools/parser/obex.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - OBEX parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2004-2005  Marcel Holtmann <marcel@holtmann.org>
  *
@@ -17,16 +17,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/parser.c b/tools/parser/parser.c
index 34ae4e5..fae13b5 100644
--- a/tools/parser/parser.c
+++ b/tools/parser/parser.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - Common parser functions
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2000-2002  Maxim Krasnyansky <maxk@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,18 +18,20 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
-#include <stdlib.h>
+#include <ctype.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/tools/parser/parser.h b/tools/parser/parser.h
index ffcc454..42ed05b 100644
--- a/tools/parser/parser.h
+++ b/tools/parser/parser.h
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - Common parser functions
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2000-2002  Maxim Krasnyansky <maxk@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,10 +18,8 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
 #ifndef __PARSER_H
diff --git a/tools/parser/rfcomm.c b/tools/parser/rfcomm.c
index 5191f70..6a1a5e5 100644
--- a/tools/parser/rfcomm.c
+++ b/tools/parser/rfcomm.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - RFCOMM parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2001-2002  Wayne Lee <waynelee@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,16 +18,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/rfcomm.h b/tools/parser/rfcomm.h
index 45a0dc5..d64b786 100644
--- a/tools/parser/rfcomm.h
+++ b/tools/parser/rfcomm.h
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - RFCOMM parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2001-2002  Wayne Lee <waynelee@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,10 +18,8 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
 #ifndef __RFCOMM_H
diff --git a/tools/parser/sdp.c b/tools/parser/sdp.c
index e5a750a..817d121 100644
--- a/tools/parser/sdp.c
+++ b/tools/parser/sdp.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - SDP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2001-2002  Ricky Yuen <ryuen@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,16 +18,18 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/tools/parser/sdp.h b/tools/parser/sdp.h
index e996d83..ea605c1 100644
--- a/tools/parser/sdp.h
+++ b/tools/parser/sdp.h
@@ -1,6 +1,6 @@
 /*
  *
- *  Bluetooth packet analyzer - SDP parser
+ *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2001-2002  Ricky Yuen <ryuen@qualcomm.com>
  *  Copyright (C) 2003-2005  Marcel Holtmann <marcel@holtmann.org>
@@ -18,10 +18,8 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *
- *  $Id$
  */
 
 #ifndef __SDP_H