diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 7a99fa9fe2f99f0da54ea318917b488f0dde345b..53611bcaf60935e2e59cd607f05493863b8e1a89 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.534 2006/04/06 04:09:14 dpgilbert Exp $
+$Id: CHANGELOG,v 1.535 2006/04/12 14:54:28 ballen4705 Exp $
 
 The most recent version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
@@ -34,6 +34,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 smartmontools 5.34 Stable Release
 
+  [BA] Update copyright dates to 2006.
+
   [DG] [SCSI] Loosen sanity check on Seagate/Hitachi factory information
        log page so it is not skipped on recent Seagate SCSI disks.
 
diff --git a/sm5/README b/sm5/README
index 0d8e6e702abccf493f116ae410000964445dd365..6d6e1c821fb5d6dd70d8c3c83da1381c8d774848 100644
--- a/sm5/README
+++ b/sm5/README
@@ -3,7 +3,7 @@ smartmontools - S.M.A.R.T. utility toolset for Darwin/Mac
 OSX, FreeBSD, Linux, NetBSD, OpenBSD, Solaris, and Windows.
 ==========================================================
 
-$Id: README,v 1.54 2005/04/20 03:29:57 ballen4705 Exp $
+$Id: README,v 1.55 2006/04/12 14:54:28 ballen4705 Exp $
 
 == HOME ==
 The home for smartmontools is located at:
@@ -19,7 +19,7 @@ You will find a mailing list for support and other questions at:
 
 
 == COPYING ==
-Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 
 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
diff --git a/sm5/atacmdnames.c b/sm5/atacmdnames.c
index 6000c9596c2ea22b6efb4fa031037949d788786c..52b68f131a2164349070a6b13496c92bd0f28fde 100644
--- a/sm5/atacmdnames.c
+++ b/sm5/atacmdnames.c
@@ -7,7 +7,7 @@
  * Home page of code is: http://smartmontools.sourceforge.net
  * Address of support mailing list: smartmontools-support@lists.sourceforge.net
  *
- * Copyright (C) 2003-5 Philip Williams
+ * Copyright (C) 2003-6 Philip Williams
  *
  * 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
@@ -26,7 +26,7 @@
 
 #define COMMAND_TABLE_SIZE 256
 
-const char *atacmdnames_c_cvsid="$Id: atacmdnames.c,v 1.12 2005/04/20 03:29:58 ballen4705 Exp $" ATACMDNAMES_H_CVSID;
+const char *atacmdnames_c_cvsid="$Id: atacmdnames.c,v 1.13 2006/04/12 14:54:28 ballen4705 Exp $" ATACMDNAMES_H_CVSID;
 
 const char cmd_reserved[]        = "[RESERVED]";
 const char cmd_vendor_specific[] = "[VENDOR SPECIFIC]";
diff --git a/sm5/atacmdnames.cpp b/sm5/atacmdnames.cpp
index f7cdb659e629c7f573b09bff714575d1f1ada084..28360da15aaf1a1fe831dff01ccc81bc807ad630 100644
--- a/sm5/atacmdnames.cpp
+++ b/sm5/atacmdnames.cpp
@@ -7,7 +7,7 @@
  * Home page of code is: http://smartmontools.sourceforge.net
  * Address of support mailing list: smartmontools-support@lists.sourceforge.net
  *
- * Copyright (C) 2003-5 Philip Williams
+ * Copyright (C) 2003-6 Philip Williams
  *
  * 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
@@ -26,7 +26,7 @@
 
 #define COMMAND_TABLE_SIZE 256
 
-const char *atacmdnames_c_cvsid="$Id: atacmdnames.cpp,v 1.12 2005/04/20 03:29:58 ballen4705 Exp $" ATACMDNAMES_H_CVSID;
+const char *atacmdnames_c_cvsid="$Id: atacmdnames.cpp,v 1.13 2006/04/12 14:54:28 ballen4705 Exp $" ATACMDNAMES_H_CVSID;
 
 const char cmd_reserved[]        = "[RESERVED]";
 const char cmd_vendor_specific[] = "[VENDOR SPECIFIC]";
diff --git a/sm5/atacmdnames.h b/sm5/atacmdnames.h
index 69fa783835ca849c33a3b2a89797a49f68fceefa..810cf94249624745d8d9bf6d7191b7c33d734c22 100644
--- a/sm5/atacmdnames.h
+++ b/sm5/atacmdnames.h
@@ -7,7 +7,7 @@
  * Home page of code is: http://smartmontools.sourceforge.net
  * Address of support mailing list: smartmontools-support@lists.sourceforge.net
  *
- * Copyright (C) 2003-5 Philip Williams
+ * Copyright (C) 2003-6 Philip Williams
  *
  * 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
@@ -23,7 +23,7 @@
 #ifndef ATACMDNAMES_H_
 #define ATACMDNAMES_H_
 
-#define ATACMDNAMES_H_CVSID "$Id: atacmdnames.h,v 1.4 2005/04/20 03:29:58 ballen4705 Exp $\n"
+#define ATACMDNAMES_H_CVSID "$Id: atacmdnames.h,v 1.5 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 /* Returns the name of the command (and possibly sub-command) with the given
    command code and feature register values. */
diff --git a/sm5/atacmds.c b/sm5/atacmds.c
index 1287f3374f25cab4236a0a6ba9dfdafdfa68776a..03d5e629c0126a6b2eb58230af5fb61c655cc9ad 100644
--- a/sm5/atacmds.c
+++ b/sm5/atacmds.c
@@ -3,7 +3,7 @@
  * 
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
  *
@@ -35,7 +35,7 @@
 #include "extern.h"
 #include "utility.h"
 
-const char *atacmds_c_cvsid="$Id: atacmds.c,v 1.166 2005/10/30 12:53:59 shattered Exp $"
+const char *atacmds_c_cvsid="$Id: atacmds.c,v 1.167 2006/04/12 14:54:28 ballen4705 Exp $"
 ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
diff --git a/sm5/atacmds.cpp b/sm5/atacmds.cpp
index d6c53a1b729a722ce887c4e5e62291220fd1f479..1e3edf5fb38a965994629fee8482ef8d030a8f39 100644
--- a/sm5/atacmds.cpp
+++ b/sm5/atacmds.cpp
@@ -3,7 +3,7 @@
  * 
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
  *
@@ -35,7 +35,7 @@
 #include "extern.h"
 #include "utility.h"
 
-const char *atacmds_c_cvsid="$Id: atacmds.cpp,v 1.166 2005/10/30 12:53:59 shattered Exp $"
+const char *atacmds_c_cvsid="$Id: atacmds.cpp,v 1.167 2006/04/12 14:54:28 ballen4705 Exp $"
 ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
diff --git a/sm5/atacmds.h b/sm5/atacmds.h
index c4112feb42d4952e2ee894505150af3f10277ff7..01698d22cecba7fe925d980e6efd73daa5c339eb 100644
--- a/sm5/atacmds.h
+++ b/sm5/atacmds.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #ifndef ATACMDS_H_
 #define ATACMDS_H_
 
-#define ATACMDS_H_CVSID "$Id: atacmds.h,v 1.80 2005/05/10 19:15:47 chrfranke Exp $\n"
+#define ATACMDS_H_CVSID "$Id: atacmds.h,v 1.81 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 // Macro to check expected size of struct at compile time using a
 // dummy typedef.  On size mismatch, compiler reports a negative array
diff --git a/sm5/ataprint.c b/sm5/ataprint.c
index 8e20ab4a1c97fbc61802dbb383931055d39452ce..09cbe4de467069f0a562720f2757687c7584b5ed 100644
--- a/sm5/ataprint.c
+++ b/sm5/ataprint.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
 #include "utility.h"
 #include "knowndrives.h"
 
-const char *ataprint_c_cvsid="$Id: ataprint.c,v 1.163 2005/10/30 12:54:00 shattered Exp $"
+const char *ataprint_c_cvsid="$Id: ataprint.c,v 1.164 2006/04/12 14:54:28 ballen4705 Exp $"
 ATACMDNAMES_H_CVSID ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
 
 // for passing global control variables
diff --git a/sm5/ataprint.cpp b/sm5/ataprint.cpp
index a9600eb6b6187f38c5e29792656d53ddbb455fb7..ac40992de325191c12419d43e5ea44fc01ef2f13 100644
--- a/sm5/ataprint.cpp
+++ b/sm5/ataprint.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
 #include "utility.h"
 #include "knowndrives.h"
 
-const char *ataprint_c_cvsid="$Id: ataprint.cpp,v 1.163 2005/10/30 12:54:00 shattered Exp $"
+const char *ataprint_c_cvsid="$Id: ataprint.cpp,v 1.164 2006/04/12 14:54:28 ballen4705 Exp $"
 ATACMDNAMES_H_CVSID ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
 
 // for passing global control variables
diff --git a/sm5/ataprint.h b/sm5/ataprint.h
index 8d975c6e93cd940d108d7060b56dbd660bb55198..d2e1e46fc4029c431f4836086dfc305599a1a491 100644
--- a/sm5/ataprint.h
+++ b/sm5/ataprint.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #ifndef ATAPRINT_H_
 #define ATAPRINT_H_
 
-#define ATAPRINT_H_CVSID "$Id: ataprint.h,v 1.27 2005/04/20 03:29:58 ballen4705 Exp $\n"
+#define ATAPRINT_H_CVSID "$Id: ataprint.h,v 1.28 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sm5/do_release b/sm5/do_release
index f570299a4c13d04a1721e0dcd04573185d3bc0f8..4320992d7932aaa167e809086704b389e4168719 100755
--- a/sm5/do_release
+++ b/sm5/do_release
@@ -1,9 +1,9 @@
 #!/bin/bash -ev
 #
 # do a smartmontools release
-# (C) 2003-5 Bruce Allen <ballen4705@users.sourceforge.net>, 
+# (C) 2003-6 Bruce Allen <ballen4705@users.sourceforge.net>, 
 #          Guido Guenther <agx@sigxcpu.org>
-# $Id: do_release,v 1.34 2005/04/20 07:38:44 ballen4705 Exp $
+# $Id: do_release,v 1.35 2006/04/12 14:54:28 ballen4705 Exp $
 
 # Notes on generating releases:
 # (1) update NEWS
diff --git a/sm5/examplescripts/README b/sm5/examplescripts/README
index 51aef608f404f1bdc1269025e4c433dd8fad2d7c..404feca2a49b8566c4ddc416426de2405ac99367 100644
--- a/sm5/examplescripts/README
+++ b/sm5/examplescripts/README
@@ -1,8 +1,8 @@
 # Home page: http://smartmontools.sourceforge.net
 #
-# $Id: README,v 1.4 2005/04/20 03:30:19 ballen4705 Exp $
+# $Id: README,v 1.5 2006/04/12 14:54:28 ballen4705 Exp $
 #
-# Copyright (C) 2003-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+# Copyright (C) 2003-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 # 
 # 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
diff --git a/sm5/extern.h b/sm5/extern.h
index 1fb4dcc2c2800194f0e083bffd79d3efcda616b1..5eabed73118cada46515997885f2d77993e81ad5 100644
--- a/sm5/extern.h
+++ b/sm5/extern.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #ifndef EXTERN_H_
 #define EXTERN_H_
 
-#define EXTERN_H_CVSID "$Id: extern.h,v 1.40 2005/04/20 03:29:58 ballen4705 Exp $\n"
+#define EXTERN_H_CVSID "$Id: extern.h,v 1.41 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 // Possible values for fixfirmwarebug.  If use has NOT specified -F at
 // all, then value is 0.
diff --git a/sm5/int64.h b/sm5/int64.h
index 5ce669f52a67ebe82365e68bcbf45824fdc366b6..64aa28dc81aaf82541b0e546f16a9fc6d8ec2d9d 100644
--- a/sm5/int64.h
+++ b/sm5/int64.h
@@ -3,8 +3,8 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2004-5 Christian Franke
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke
  *
  * 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
@@ -20,7 +20,7 @@
 #ifndef INT64_H_
 #define INT64_H_
 
-#define INT64_H_CVSID "$Id: int64.h,v 1.12 2005/04/20 03:29:58 ballen4705 Exp $\n"
+#define INT64_H_CVSID "$Id: int64.h,v 1.13 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 // 64 bit integer typedefs
 
diff --git a/sm5/os_darwin.c b/sm5/os_darwin.c
index 0278304ec9c9c6949f53d46d97fb431114aca165..d733290957f24fd32bb5012dd72ef9a394f047b5 100644
--- a/sm5/os_darwin.c
+++ b/sm5/os_darwin.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Geoffrey Keating <geoffk@geoffk.org>
+ * Copyright (C) 2004-6 Geoffrey Keating <geoffk@geoffk.org>
  *
  * 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
@@ -42,7 +42,7 @@
 #include "os_darwin.h"
 
 // Needed by '-V' option (CVS versioning) of smartd/smartctl
-const char *os_XXXX_c_cvsid="$Id: os_darwin.c,v 1.12 2005/04/20 03:29:58 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_darwin.c,v 1.13 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_DARWIN_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // Print examples for smartctl.
diff --git a/sm5/os_darwin.cpp b/sm5/os_darwin.cpp
index 006dc7433ea5db402ae04980bc0786df5a4cbcfb..d34173a1fd6759a46dea2e08b541491743cac10e 100644
--- a/sm5/os_darwin.cpp
+++ b/sm5/os_darwin.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Geoffrey Keating <geoffk@geoffk.org>
+ * Copyright (C) 2004-6 Geoffrey Keating <geoffk@geoffk.org>
  *
  * 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
@@ -42,7 +42,7 @@
 #include "os_darwin.h"
 
 // Needed by '-V' option (CVS versioning) of smartd/smartctl
-const char *os_XXXX_c_cvsid="$Id: os_darwin.cpp,v 1.12 2005/04/20 03:29:58 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_darwin.cpp,v 1.13 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_DARWIN_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // Print examples for smartctl.
diff --git a/sm5/os_darwin.h b/sm5/os_darwin.h
index abd6bbb55a317a86e03eaad28ecccf4d9f993570..115d70495b8b0c4bfa3ce417e65f45e2605ccbef 100644
--- a/sm5/os_darwin.h
+++ b/sm5/os_darwin.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Geoff Keating <geoffk@geoffk.org>
+ * Copyright (C) 2004-6 Geoff Keating <geoffk@geoffk.org>
  *
  * 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
@@ -24,7 +24,7 @@
 #ifndef OS_DARWIN_H_
 #define OS_DARWIN_H_
 
-#define OS_DARWIN_H_CVSID "$Id: os_darwin.h,v 1.4 2005/04/20 03:29:58 ballen4705 Exp $\n"
+#define OS_DARWIN_H_CVSID "$Id: os_darwin.h,v 1.5 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 // There isn't actually any content here yet.
 
diff --git a/sm5/os_darwin/SMART.in b/sm5/os_darwin/SMART.in
index d38ba9eede344d77280bdf482b81de6b87fe15c1..c37b5b24c0f17b15b8d466eeef6440d3bc7ef9a6 100644
--- a/sm5/os_darwin/SMART.in
+++ b/sm5/os_darwin/SMART.in
@@ -4,7 +4,7 @@
 #
 # Home page of code is: http://smartmontools.sourceforge.net
 #
-# Copyright (C) 2004-5 Geoffrey Keating <geoffk@geoffk.org>
+# Copyright (C) 2004-6 Geoffrey Keating <geoffk@geoffk.org>
 #
 # 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
@@ -15,7 +15,7 @@
 # example COPYING); if not, write to the Free Software Foundation, Inc., 675
 # Mass Ave, Cambridge, MA 02139, USA.
 
-# $Id: SMART.in,v 1.3 2005/04/20 03:30:19 ballen4705 Exp $
+# $Id: SMART.in,v 1.4 2006/04/12 14:54:28 ballen4705 Exp $
 
 ##
 # SMART monitoring
diff --git a/sm5/os_freebsd.c b/sm5/os_freebsd.c
index cc2aab68b89fce127b93d04771f07e7b8a2de98d..19bbef115940b98405b45cfb06e450b5d364603d 100644
--- a/sm5/os_freebsd.c
+++ b/sm5/os_freebsd.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Eduard Martinescu <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Eduard Martinescu <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -38,9 +38,9 @@
 #include "utility.h"
 #include "os_freebsd.h"
 
-static const char *filenameandversion="$Id: os_freebsd.c,v 1.48 2005/12/03 19:02:21 arvoreen Exp $";
+static const char *filenameandversion="$Id: os_freebsd.c,v 1.49 2006/04/12 14:54:28 ballen4705 Exp $";
 
-const char *os_XXXX_c_cvsid="$Id: os_freebsd.c,v 1.48 2005/12/03 19:02:21 arvoreen Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_freebsd.c,v 1.49 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_FREEBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
diff --git a/sm5/os_freebsd.cpp b/sm5/os_freebsd.cpp
index bf31f702422001361bf5ba63963848e3167a8e66..7f5c9eca54e94caba1e31a4c1c2870266891e197 100644
--- a/sm5/os_freebsd.cpp
+++ b/sm5/os_freebsd.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Eduard Martinescu <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Eduard Martinescu <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -38,9 +38,9 @@
 #include "utility.h"
 #include "os_freebsd.h"
 
-static const char *filenameandversion="$Id: os_freebsd.cpp,v 1.48 2005/12/03 19:02:21 arvoreen Exp $";
+static const char *filenameandversion="$Id: os_freebsd.cpp,v 1.49 2006/04/12 14:54:28 ballen4705 Exp $";
 
-const char *os_XXXX_c_cvsid="$Id: os_freebsd.cpp,v 1.48 2005/12/03 19:02:21 arvoreen Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_freebsd.cpp,v 1.49 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_FREEBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
diff --git a/sm5/os_freebsd.h b/sm5/os_freebsd.h
index 9e6d27126ce11bfe29b0a944ccf2b0fe514e2203..da50231e20c577765d2a1d2dcafaa306e7d75894 100644
--- a/sm5/os_freebsd.h
+++ b/sm5/os_freebsd.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Eduard Martinescu <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Eduard Martinescu <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -82,7 +82,7 @@
 #ifndef OS_FREEBSD_H_
 #define OS_FREEBSD_H_
 
-#define OS_FREEBSD_H_CVSID "$Id: os_freebsd.h,v 1.19 2005/09/26 22:33:36 arvoreen Exp $\n"
+#define OS_FREEBSD_H_CVSID "$Id: os_freebsd.h,v 1.20 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 struct freebsd_dev_channel {
   int   channel;                // the ATA channel to work with
diff --git a/sm5/os_generic.c b/sm5/os_generic.c
index 563e05fe071e5be52dfe8005a3a1780f7524250a..3c5b5c4c508e399f7edde801a03db23e2cf13928 100644
--- a/sm5/os_generic.c
+++ b/sm5/os_generic.c
@@ -4,7 +4,7 @@
  * Home page of code is: http://smartmontools.sourceforge.net
  *
  * Copyright (C) YEAR YOUR_NAME <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2003-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -70,7 +70,7 @@
 // should have one *_H_CVSID macro appearing below for each file
 // appearing with #include "*.h" above.  Please list these (below) in
 // alphabetic/dictionary order.
-const char *os_XXXX_c_cvsid="$Id: os_generic.c,v 1.20 2005/04/20 03:29:59 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_generic.c,v 1.21 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_GENERIC_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 
diff --git a/sm5/os_generic.cpp b/sm5/os_generic.cpp
index 13cb312580da622f3c52c57b734370b7b3336cd3..8cd08505219cb63a2d9e32974a859b9db5044a81 100644
--- a/sm5/os_generic.cpp
+++ b/sm5/os_generic.cpp
@@ -4,7 +4,7 @@
  * Home page of code is: http://smartmontools.sourceforge.net
  *
  * Copyright (C) YEAR YOUR_NAME <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2003-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -70,7 +70,7 @@
 // should have one *_H_CVSID macro appearing below for each file
 // appearing with #include "*.h" above.  Please list these (below) in
 // alphabetic/dictionary order.
-const char *os_XXXX_c_cvsid="$Id: os_generic.cpp,v 1.20 2005/04/20 03:29:59 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_generic.cpp,v 1.21 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_GENERIC_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 
diff --git a/sm5/os_generic.h b/sm5/os_generic.h
index 73914f1eae6a7712ec7fa04c182d6ba6d6dcba26..fae520937b4f3d7e0b403ca916a72cec31a6f697 100644
--- a/sm5/os_generic.h
+++ b/sm5/os_generic.h
@@ -4,7 +4,7 @@
  * Home page of code is: http://smartmontools.sourceforge.net
  *
  * Copyright (C) YEAR YOUR_NAME <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2003-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -25,7 +25,7 @@
 // In the three following lines, change 'GENERIC' to your OS name
 #ifndef OS_GENERIC_H_
 #define OS_GENERIC_H_
-#define OS_GENERIC_H_CVSID "$Id: os_generic.h,v 1.5 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define OS_GENERIC_H_CVSID "$Id: os_generic.h,v 1.6 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 // Additional material should start here.  Note: to keep the '-V' CVS
 // reporting option working as intended, you should only #include
diff --git a/sm5/os_linux.c b/sm5/os_linux.c
index 2bc7ef54b2b275cdbf0fc426d3819296c7860952..bdab17f2c8b8ade40c9e5f4e6cc449f66c3251ab 100644
--- a/sm5/os_linux.c
+++ b/sm5/os_linux.c
@@ -3,8 +3,8 @@
  * 
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2003-5 Doug Gilbert <dougg@torque.net>
+ * Copyright (C) 2003-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Doug Gilbert <dougg@torque.net>
  *
  *  Parts of this file are derived from code that was
  *
@@ -72,9 +72,9 @@ typedef unsigned long long u8;
 
 #define ARGUSED(x) ((void)(x))
 
-static const char *filenameandversion="$Id: os_linux.c,v 1.80 2005/09/19 01:04:08 dpgilbert Exp $";
+static const char *filenameandversion="$Id: os_linux.c,v 1.81 2006/04/12 14:54:28 ballen4705 Exp $";
 
-const char *os_XXXX_c_cvsid="$Id: os_linux.c,v 1.80 2005/09/19 01:04:08 dpgilbert Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_linux.c,v 1.81 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_LINUX_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
diff --git a/sm5/os_linux.cpp b/sm5/os_linux.cpp
index 0c5f1339611a5e062b547ac40062f35dec85ca29..c2c06b02a7f0b76b6bcf96113986c7daa1d0d13f 100644
--- a/sm5/os_linux.cpp
+++ b/sm5/os_linux.cpp
@@ -3,8 +3,8 @@
  * 
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2003-5 Doug Gilbert <dougg@torque.net>
+ * Copyright (C) 2003-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Doug Gilbert <dougg@torque.net>
  *
  *  Parts of this file are derived from code that was
  *
@@ -72,9 +72,9 @@ typedef unsigned long long u8;
 
 #define ARGUSED(x) ((void)(x))
 
-static const char *filenameandversion="$Id: os_linux.cpp,v 1.80 2005/09/19 01:04:08 dpgilbert Exp $";
+static const char *filenameandversion="$Id: os_linux.cpp,v 1.81 2006/04/12 14:54:28 ballen4705 Exp $";
 
-const char *os_XXXX_c_cvsid="$Id: os_linux.cpp,v 1.80 2005/09/19 01:04:08 dpgilbert Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_linux.cpp,v 1.81 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_LINUX_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
diff --git a/sm5/os_linux.h b/sm5/os_linux.h
index 94505953cab72ef27056546ee4a90e211f84b615..71a41022df4e32538349f1fb22037bbfaca62cf7 100644
--- a/sm5/os_linux.h
+++ b/sm5/os_linux.h
@@ -3,7 +3,7 @@
  * 
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  *
  * Derived from code that was
  *
@@ -38,7 +38,7 @@
 #ifndef OS_LINUX_H_
 #define OS_LINUX_H_
 
-#define OS_LINUX_H_CVSID "$Id: os_linux.h,v 1.23 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define OS_LINUX_H_CVSID "$Id: os_linux.h,v 1.24 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 /* 
    The following definitions/macros/prototypes are used for three
diff --git a/sm5/os_netbsd.c b/sm5/os_netbsd.c
index 20020443cb0e104bf7ece791afa3163f608abbb9..4f6cee03817b5224450f1008c244977ffdc30589 100644
--- a/sm5/os_netbsd.c
+++ b/sm5/os_netbsd.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Sergey Svishchev <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Sergey Svishchev <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -24,7 +24,7 @@
 #include "os_netbsd.h"
 #include <unistd.h>
 
-const char *os_XXXX_c_cvsid = "$Id: os_netbsd.c,v 1.14 2005/10/30 12:54:00 shattered Exp $" \
+const char *os_XXXX_c_cvsid = "$Id: os_netbsd.c,v 1.15 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_NETBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 /* global variable holding byte count of allocated memory */
diff --git a/sm5/os_netbsd.cpp b/sm5/os_netbsd.cpp
index e5e0ecc5bd45754b87a1d155242c33e4b9e3ed6b..732aef6286472f687ddfb4fbd963841af690057e 100644
--- a/sm5/os_netbsd.cpp
+++ b/sm5/os_netbsd.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Sergey Svishchev <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Sergey Svishchev <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -24,7 +24,7 @@
 #include "os_netbsd.h"
 #include <unistd.h>
 
-const char *os_XXXX_c_cvsid = "$Id: os_netbsd.cpp,v 1.14 2005/10/30 12:54:00 shattered Exp $" \
+const char *os_XXXX_c_cvsid = "$Id: os_netbsd.cpp,v 1.15 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_NETBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 /* global variable holding byte count of allocated memory */
diff --git a/sm5/os_netbsd.h b/sm5/os_netbsd.h
index 8c2f6deb15b4cffc37eb156b1618bb2ed3dbed4f..b5ed73317c97b5760d810f9d7f1e0cb2cca75b9f 100644
--- a/sm5/os_netbsd.h
+++ b/sm5/os_netbsd.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 Sergey Svishchev <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Sergey Svishchev <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -24,7 +24,7 @@
 #ifndef OS_NETBSD_H_
 #define OS_NETBSD_H_
 
-#define OS_NETBSD_H_CVSID "$Id: os_netbsd.h,v 1.8 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define OS_NETBSD_H_CVSID "$Id: os_netbsd.h,v 1.9 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 #include <sys/device.h>
 #include <sys/param.h>
diff --git a/sm5/os_openbsd.c b/sm5/os_openbsd.c
index 9d53058721508b0b719810e7ed3dad8e002ee30b..33a7039d17216e0d3dff552203c464d0ed1a6b42 100644
--- a/sm5/os_openbsd.c
+++ b/sm5/os_openbsd.c
@@ -3,9 +3,9 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 David Snyder <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 David Snyder <smartmontools-support@lists.sourceforge.net>
  *
- * Derived from os_netbsd.c by Sergey Svishchev <smartmontools-support@lists.sourceforge.net>, Copyright (C) 2003-5 
+ * Derived from os_netbsd.c by Sergey Svishchev <smartmontools-support@lists.sourceforge.net>, Copyright (C) 2003-6 
  *
  * 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
@@ -25,7 +25,7 @@
 #include "utility.h"
 #include "os_openbsd.h"
 
-const char *os_XXXX_c_cvsid = "$Id: os_openbsd.c,v 1.9 2005/04/20 03:29:59 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid = "$Id: os_openbsd.c,v 1.10 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_OPENBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 /* global variable holding byte count of allocated memory */
diff --git a/sm5/os_openbsd.cpp b/sm5/os_openbsd.cpp
index 6afac19c7349e3e0ff8bad36608cba4af5e52b0b..fad39e629692ff670a55da9215ab8856f34a5d61 100644
--- a/sm5/os_openbsd.cpp
+++ b/sm5/os_openbsd.cpp
@@ -3,9 +3,9 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 David Snyder <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 David Snyder <smartmontools-support@lists.sourceforge.net>
  *
- * Derived from os_netbsd.c by Sergey Svishchev <smartmontools-support@lists.sourceforge.net>, Copyright (C) 2003-5 
+ * Derived from os_netbsd.c by Sergey Svishchev <smartmontools-support@lists.sourceforge.net>, Copyright (C) 2003-6 
  *
  * 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
@@ -25,7 +25,7 @@
 #include "utility.h"
 #include "os_openbsd.h"
 
-const char *os_XXXX_c_cvsid = "$Id: os_openbsd.cpp,v 1.9 2005/04/20 03:29:59 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid = "$Id: os_openbsd.cpp,v 1.10 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_OPENBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 /* global variable holding byte count of allocated memory */
diff --git a/sm5/os_openbsd.h b/sm5/os_openbsd.h
index abc44f6f39f50f0902043b8ee0debc0e63d70225..356343a9fa166778abb9c6ab719951e919c2441a 100644
--- a/sm5/os_openbsd.h
+++ b/sm5/os_openbsd.h
@@ -3,9 +3,9 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 David Snyder <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 David Snyder <smartmontools-support@lists.sourceforge.net>
  *
- * Derived from os_netbsd.c by Sergey Svishchev <smartmontools-support@lists.sourceforge.net>, Copyright (C) 2003-5 
+ * Derived from os_netbsd.c by Sergey Svishchev <smartmontools-support@lists.sourceforge.net>, Copyright (C) 2003-6 
  *
  * 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
@@ -26,7 +26,7 @@
 #ifndef OS_OPENBSD_H_
 #define OS_OPENBSD_H_
 
-#define OS_OPENBSD_H_CVSID "$Id: os_openbsd.h,v 1.3 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define OS_OPENBSD_H_CVSID "$Id: os_openbsd.h,v 1.4 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 /* from NetBSD: atareg.h,v 1.17, by Manuel Bouyer */
 /* Actually fits _perfectly_ into OBSDs wdcreg.h, but... */
diff --git a/sm5/os_os2.c b/sm5/os_os2.c
index 1f4601169565697bf03d1db2731828f12efc58c4..3a0f2212271fd6c700c88f9af7e35a74c33658d7 100644
--- a/sm5/os_os2.c
+++ b/sm5/os_os2.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Yuri Dario <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Yuri Dario <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -31,7 +31,7 @@
 #include "os_os2.h"
 
 // Needed by '-V' option (CVS versioning) of smartd/smartctl
-const char *os_XXXX_c_cvsid="$Id: os_os2.c,v 1.4 2005/04/20 03:29:59 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_os2.c,v 1.5 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // global handle to device driver
diff --git a/sm5/os_os2.cpp b/sm5/os_os2.cpp
index ec70276d26764508c93faaab8c25871fec047212..e70b57ac1f4919a598ddb21d678964409b619d3c 100644
--- a/sm5/os_os2.cpp
+++ b/sm5/os_os2.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Yuri Dario <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Yuri Dario <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -31,7 +31,7 @@
 #include "os_os2.h"
 
 // Needed by '-V' option (CVS versioning) of smartd/smartctl
-const char *os_XXXX_c_cvsid="$Id: os_os2.cpp,v 1.4 2005/04/20 03:29:59 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_os2.cpp,v 1.5 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // global handle to device driver
diff --git a/sm5/os_os2.h b/sm5/os_os2.h
index e3a8ec8bea6ad6aa84f3b157461df5c12c2b7db8..4a9c1308310319b92d934d7ad43779cc36859502 100644
--- a/sm5/os_os2.h
+++ b/sm5/os_os2.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Yuri Dario <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Yuri Dario <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -18,7 +18,7 @@
 #ifndef OS_OS2_H_
 #define OS_OS2_H_
 
-#define OS_XXXX_H_CVSID "$Id: os_os2.h,v 1.3 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define OS_XXXX_H_CVSID "$Id: os_os2.h,v 1.4 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 // Additional material should start here.  Note: to keep the '-V' CVS
 // reporting option working as intended, you should only #include
diff --git a/sm5/os_solaris.c b/sm5/os_solaris.c
index 606f95b540a66abdb4be495304965b83ea706617..d68197c0b24475472fc433603d83a922c66949e1 100644
--- a/sm5/os_solaris.c
+++ b/sm5/os_solaris.c
@@ -3,8 +3,8 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2003-5 Casper Dik <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Casper Dik <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -39,9 +39,9 @@
 
 extern long long bytes;
 
-static const char *filenameandversion="$Id: os_solaris.c,v 1.25 2005/04/20 03:29:59 ballen4705 Exp $";
+static const char *filenameandversion="$Id: os_solaris.c,v 1.26 2006/04/12 14:54:28 ballen4705 Exp $";
 
-const char *os_XXXX_c_cvsid="$Id: os_solaris.c,v 1.25 2005/04/20 03:29:59 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_solaris.c,v 1.26 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_SOLARIS_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // The printwarning() function warns about unimplemented functions
diff --git a/sm5/os_solaris.cpp b/sm5/os_solaris.cpp
index 751f8fcf4042c81e99ab2e4c8b33436e82e25898..a8eee54412f44784ad0f8fc5eea99f45e2efd859 100644
--- a/sm5/os_solaris.cpp
+++ b/sm5/os_solaris.cpp
@@ -3,8 +3,8 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2003-5 Casper Dik <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Casper Dik <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -39,9 +39,9 @@
 
 extern long long bytes;
 
-static const char *filenameandversion="$Id: os_solaris.cpp,v 1.25 2005/04/20 03:29:59 ballen4705 Exp $";
+static const char *filenameandversion="$Id: os_solaris.cpp,v 1.26 2006/04/12 14:54:28 ballen4705 Exp $";
 
-const char *os_XXXX_c_cvsid="$Id: os_solaris.cpp,v 1.25 2005/04/20 03:29:59 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_solaris.cpp,v 1.26 2006/04/12 14:54:28 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_SOLARIS_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // The printwarning() function warns about unimplemented functions
diff --git a/sm5/os_solaris.h b/sm5/os_solaris.h
index 5d35d556a94cd33b6c9c89d41a08b116480fffb1..202dcac7af78f122efbaa6f206abda9f0fcf6c46 100644
--- a/sm5/os_solaris.h
+++ b/sm5/os_solaris.h
@@ -3,8 +3,8 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2003-5 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2003-5 Casper Dik <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2003-6 Casper Dik <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -25,7 +25,7 @@
 #ifndef OS_SOLARIS_H_
 #define OS_SOLARIS_H_
 
-#define OS_SOLARIS_H_CVSID "$Id: os_solaris.h,v 1.11 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define OS_SOLARIS_H_CVSID "$Id: os_solaris.h,v 1.12 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 // Additional material should start here.  Note: to keep the '-V' CVS
 // reporting option working as intended, you should only #include
diff --git a/sm5/os_solaris_ata.s b/sm5/os_solaris_ata.s
index 54dc358ad9811f9c166803d2ab889c7a823f1658..3199e179280a56e2c95f76d211856aa2f1604104 100644
--- a/sm5/os_solaris_ata.s
+++ b/sm5/os_solaris_ata.s
@@ -3,7 +3,7 @@
 ! 
 !   Home page of code is: http://smartmontools.sourceforge.net
 ! 
-!   Copyright (C) 2003-5 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
+!   Copyright (C) 2003-6 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
 ! 
 !   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
@@ -97,7 +97,7 @@
 	.section	".rodata"
 	.align 8
 .LLC0:
-	.asciz	"$Id: os_solaris_ata.s,v 1.4 2005/04/20 03:29:59 ballen4705 Exp $"
+	.asciz	"$Id: os_solaris_ata.s,v 1.5 2006/04/12 14:54:28 ballen4705 Exp $"
 	.global os_solaris_ata_s_cvsid
 	.section	".data"
 	.align 4
diff --git a/sm5/os_win32/daemon_win32.c b/sm5/os_win32/daemon_win32.c
index f4f56a3bbe5f72549f856023314c8b3c3ae67553..2cac47f00372f5e9b6693ac9090329cf8dfc99d2 100644
--- a/sm5/os_win32/daemon_win32.c
+++ b/sm5/os_win32/daemon_win32.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -31,7 +31,7 @@
 
 #include "daemon_win32.h"
 
-const char *daemon_win32_c_cvsid = "$Id: daemon_win32.c,v 1.9 2005/04/08 15:28:31 chrfranke Exp $"
+const char *daemon_win32_c_cvsid = "$Id: daemon_win32.c,v 1.10 2006/04/12 14:54:28 ballen4705 Exp $"
 DAEMON_WIN32_H_CVSID;
 
 
diff --git a/sm5/os_win32/daemon_win32.cpp b/sm5/os_win32/daemon_win32.cpp
index 86ac5a84832ec96062959e5c4ac52510fc5f2624..d1a634fab53d3194a34156b0412687d70ff16dff 100644
--- a/sm5/os_win32/daemon_win32.cpp
+++ b/sm5/os_win32/daemon_win32.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -31,7 +31,7 @@
 
 #include "daemon_win32.h"
 
-const char *daemon_win32_c_cvsid = "$Id: daemon_win32.cpp,v 1.9 2005/04/08 15:28:31 chrfranke Exp $"
+const char *daemon_win32_c_cvsid = "$Id: daemon_win32.cpp,v 1.10 2006/04/12 14:54:28 ballen4705 Exp $"
 DAEMON_WIN32_H_CVSID;
 
 
diff --git a/sm5/os_win32/daemon_win32.h b/sm5/os_win32/daemon_win32.h
index 9201cb1973521b034f64cde4b553277c104b8b78..60b72a3b075a389353556e356abf87f957367eee 100644
--- a/sm5/os_win32/daemon_win32.h
+++ b/sm5/os_win32/daemon_win32.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -19,7 +19,7 @@
 #ifndef DAEMON_WIN32_H
 #define DAEMON_WIN32_H
 
-#define DAEMON_WIN32_H_CVSID "$Id: daemon_win32.h,v 1.5 2005/04/20 03:30:19 ballen4705 Exp $\n"
+#define DAEMON_WIN32_H_CVSID "$Id: daemon_win32.h,v 1.6 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 #include <signal.h>
 
diff --git a/sm5/os_win32/hostname_win32.c b/sm5/os_win32/hostname_win32.c
index c5d63b773680e622831cd975ada7f17930c52b3f..6202effa6898cb27ef589324329ef687f213d781 100644
--- a/sm5/os_win32/hostname_win32.c
+++ b/sm5/os_win32/hostname_win32.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -18,7 +18,7 @@
 
 #include "hostname_win32.h"
 
-const char * hostname_win32_c_cvsid = "$Id: hostname_win32.c,v 1.3 2005/04/20 03:30:20 ballen4705 Exp $" HOSTNAME_WIN32_H_CVSID;
+const char * hostname_win32_c_cvsid = "$Id: hostname_win32.c,v 1.4 2006/04/12 14:54:28 ballen4705 Exp $" HOSTNAME_WIN32_H_CVSID;
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/sm5/os_win32/hostname_win32.cpp b/sm5/os_win32/hostname_win32.cpp
index 56cce9a561f6228b857a2c4eb6b31358aa05b16b..aa31656fa33185a4a8fb7b60108469e926ee70a3 100644
--- a/sm5/os_win32/hostname_win32.cpp
+++ b/sm5/os_win32/hostname_win32.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -18,7 +18,7 @@
 
 #include "hostname_win32.h"
 
-const char * hostname_win32_c_cvsid = "$Id: hostname_win32.cpp,v 1.3 2005/04/20 03:30:20 ballen4705 Exp $" HOSTNAME_WIN32_H_CVSID;
+const char * hostname_win32_c_cvsid = "$Id: hostname_win32.cpp,v 1.4 2006/04/12 14:54:28 ballen4705 Exp $" HOSTNAME_WIN32_H_CVSID;
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/sm5/os_win32/hostname_win32.h b/sm5/os_win32/hostname_win32.h
index ed4d13b108db64f235f7f3f4a844db528855f8be..259735fc8d4d0f5d5953e846309209c820b04a6c 100644
--- a/sm5/os_win32/hostname_win32.h
+++ b/sm5/os_win32/hostname_win32.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -19,7 +19,7 @@
 #ifndef HOSTNAME_WIN32_H
 #define HOSTNAME_WIN32_H
 
-#define HOSTNAME_WIN32_H_CVSID "$Id: hostname_win32.h,v 1.2 2005/04/20 03:30:20 ballen4705 Exp $\n"
+#define HOSTNAME_WIN32_H_CVSID "$Id: hostname_win32.h,v 1.3 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 int gethostname(char * name, int len);
 int getdomainname(char * name, int len);
diff --git a/sm5/os_win32/syslog.h b/sm5/os_win32/syslog.h
index 11419c66e570e1d0dca5fdb7132cd22f75fffa30..7ef23f0caededc4c8b61ef3197afb3a0b0b3c16e 100644
--- a/sm5/os_win32/syslog.h
+++ b/sm5/os_win32/syslog.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -19,7 +19,7 @@
 #ifndef SYSLOG_H
 #define SYSLOG_H
 
-#define SYSLOG_H_CVSID "$Id: syslog.h,v 1.3 2005/04/20 03:30:20 ballen4705 Exp $\n"
+#define SYSLOG_H_CVSID "$Id: syslog.h,v 1.4 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 #include <stdarg.h>
 
diff --git a/sm5/os_win32/syslog_win32.c b/sm5/os_win32/syslog_win32.c
index 11f9f9d9ddc9255b4bd7b76f9d6e31e9a3a7920b..7ed039fc93ab2ab6821c33358f3f57966a328dea 100644
--- a/sm5/os_win32/syslog_win32.c
+++ b/sm5/os_win32/syslog_win32.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -35,7 +35,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h> // RegisterEventSourceA(), ReportEventA(), ...
 
-const char *syslog_win32_c_cvsid = "$Id: syslog_win32.c,v 1.5 2005/04/20 03:30:20 ballen4705 Exp $"
+const char *syslog_win32_c_cvsid = "$Id: syslog_win32.c,v 1.6 2006/04/12 14:54:29 ballen4705 Exp $"
 SYSLOG_H_CVSID;
 
 #ifdef _MSC_VER
diff --git a/sm5/os_win32/syslog_win32.cpp b/sm5/os_win32/syslog_win32.cpp
index 4935406915e94330ecb308eb946d627769fbea2e..5bb993b1094cb2ff4f18b730f2a5d294867d033a 100644
--- a/sm5/os_win32/syslog_win32.cpp
+++ b/sm5/os_win32/syslog_win32.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -35,7 +35,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h> // RegisterEventSourceA(), ReportEventA(), ...
 
-const char *syslog_win32_c_cvsid = "$Id: syslog_win32.cpp,v 1.5 2005/04/20 03:30:20 ballen4705 Exp $"
+const char *syslog_win32_c_cvsid = "$Id: syslog_win32.cpp,v 1.6 2006/04/12 14:54:29 ballen4705 Exp $"
 SYSLOG_H_CVSID;
 
 #ifdef _MSC_VER
diff --git a/sm5/os_win32/syslogevt.c b/sm5/os_win32/syslogevt.c
index af2bc209d16b7922b6e847c916059d970c302ddf..016bf988117d7e0f0679d29d55e07016c648cc54 100644
--- a/sm5/os_win32/syslogevt.c
+++ b/sm5/os_win32/syslogevt.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
  *
  * 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
@@ -16,7 +16,7 @@
  *
  */
 
-static char rcsid[] = "$Id: syslogevt.c,v 1.3 2005/04/20 03:30:20 ballen4705 Exp $";
+static char rcsid[] = "$Id: syslogevt.c,v 1.4 2006/04/12 14:54:29 ballen4705 Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +33,7 @@ static char rcsid[] = "$Id: syslogevt.c,v 1.3 2005/04/20 03:30:20 ballen4705 Exp
 static int usage()
 {
 	puts(
-		"syslogevt $Revision: 1.3 $ Copyright (C) 2004-5 Christian Franke\n"
+		"syslogevt $Revision: 1.4 $ Copyright (C) 2004-6 Christian Franke\n"
 		"Home page is http://smartmontools.sourceforge.net/\n"
 		"\n"
 		"Usage: syslogevt [-ru] name [ident ...]\n"
diff --git a/sm5/os_win32/syslogevt.mc b/sm5/os_win32/syslogevt.mc
index 7ae802108fe7f86e816d9c2ccf8d629de81be92b..41675a14f79c696bc43cd10f6d15fb6ee5edeec4 100644
--- a/sm5/os_win32/syslogevt.mc
+++ b/sm5/os_win32/syslogevt.mc
@@ -3,7 +3,7 @@
 ; *
 ; * Home page of code is: http://smartmontools.sourceforge.net
 ; *
-; * Copyright (C) 2004-5 Christian Franke <smartmontools-support@lists.sourceforge.net>
+; * Copyright (C) 2004-6 Christian Franke <smartmontools-support@lists.sourceforge.net>
 ; *
 ; * 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
@@ -16,7 +16,7 @@
 ; *
 ; */
 ;
-;// $Id: syslogevt.mc,v 1.3 2005/04/20 03:30:20 ballen4705 Exp $
+;// $Id: syslogevt.mc,v 1.4 2006/04/12 14:54:29 ballen4705 Exp $
 ;
 ;// Use message compiler "mc" to generate
 ;//   syslogevt.rc, syslogevt.h, msg00001.bin
diff --git a/sm5/scsicmds.c b/sm5/scsicmds.c
index 791e42acdae00d13ca06c82b9cccba1e45abaaa1..36ae6dcaa3b7411d362076caf4bf56c60738bec2 100644
--- a/sm5/scsicmds.c
+++ b/sm5/scsicmds.c
@@ -3,11 +3,11 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * Additional SCSI work:
- * Copyright (C) 2003-5 Douglas Gilbert <dougg@torque.net>
+ * Copyright (C) 2003-6 Douglas Gilbert <dougg@torque.net>
  *
  * 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
@@ -47,7 +47,7 @@
 #include "scsicmds.h"
 #include "utility.h"
 
-const char *scsicmds_c_cvsid="$Id: scsicmds.c,v 1.84 2006/01/16 07:34:35 dpgilbert Exp $"
+const char *scsicmds_c_cvsid="$Id: scsicmds.c,v 1.85 2006/04/12 14:54:28 ballen4705 Exp $"
 CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 /* for passing global control variables */
diff --git a/sm5/scsicmds.cpp b/sm5/scsicmds.cpp
index 10e1375682c2f51e8e1c3064ea62378f9faeca79..4b5d2f308da5514a40f181a319da32c8194d1a33 100644
--- a/sm5/scsicmds.cpp
+++ b/sm5/scsicmds.cpp
@@ -3,11 +3,11 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * Additional SCSI work:
- * Copyright (C) 2003-5 Douglas Gilbert <dougg@torque.net>
+ * Copyright (C) 2003-6 Douglas Gilbert <dougg@torque.net>
  *
  * 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
@@ -47,7 +47,7 @@
 #include "scsicmds.h"
 #include "utility.h"
 
-const char *scsicmds_c_cvsid="$Id: scsicmds.cpp,v 1.84 2006/01/16 07:34:35 dpgilbert Exp $"
+const char *scsicmds_c_cvsid="$Id: scsicmds.cpp,v 1.85 2006/04/12 14:54:28 ballen4705 Exp $"
 CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 /* for passing global control variables */
diff --git a/sm5/scsicmds.h b/sm5/scsicmds.h
index 5e0abcfd598021d30020747a29d41753507b15cd..11b50879c606b1d61fef62e02debccad13b5aef9 100644
--- a/sm5/scsicmds.h
+++ b/sm5/scsicmds.h
@@ -3,11 +3,11 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * Additional SCSI work:
- * Copyright (C) 2003-5 Douglas Gilbert <dougg@torque.net>
+ * Copyright (C) 2003-6 Douglas Gilbert <dougg@torque.net>
  *
  * 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
@@ -32,7 +32,7 @@
 #ifndef SCSICMDS_H_
 #define SCSICMDS_H_
 
-#define SCSICMDS_H_CVSID "$Id: scsicmds.h,v 1.56 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define SCSICMDS_H_CVSID "$Id: scsicmds.h,v 1.57 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sm5/scsiprint.c b/sm5/scsiprint.c
index ca10e59e61527f297124a8c334a92dd1baa9fc40..77a2742d5fb058686cf7a13ba507e87c32f0b610 100644
--- a/sm5/scsiprint.c
+++ b/sm5/scsiprint.c
@@ -3,11 +3,11 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * Additional SCSI work:
- * Copyright (C) 2003-5 Douglas Gilbert <dougg@torque.net>
+ * Copyright (C) 2003-6 Douglas Gilbert <dougg@torque.net>
  *
  * 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
@@ -41,7 +41,7 @@
 
 #define GBUF_SIZE 65535
 
-const char* scsiprint_c_cvsid="$Id: scsiprint.c,v 1.105 2006/04/12 14:23:56 ballen4705 Exp $"
+const char* scsiprint_c_cvsid="$Id: scsiprint.c,v 1.106 2006/04/12 14:54:28 ballen4705 Exp $"
 CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
 
 // control block which points to external global control variables
diff --git a/sm5/scsiprint.cpp b/sm5/scsiprint.cpp
index c183d42c7f9f5013208293fdd6dfb9128f60f441..3cd6bf6cad0f8b814f23422470048b044c2f3926 100644
--- a/sm5/scsiprint.cpp
+++ b/sm5/scsiprint.cpp
@@ -3,11 +3,11 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * Additional SCSI work:
- * Copyright (C) 2003-5 Douglas Gilbert <dougg@torque.net>
+ * Copyright (C) 2003-6 Douglas Gilbert <dougg@torque.net>
  *
  * 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
@@ -41,7 +41,7 @@
 
 #define GBUF_SIZE 65535
 
-const char* scsiprint_c_cvsid="$Id: scsiprint.cpp,v 1.105 2006/04/12 14:23:56 ballen4705 Exp $"
+const char* scsiprint_c_cvsid="$Id: scsiprint.cpp,v 1.106 2006/04/12 14:54:28 ballen4705 Exp $"
 CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
 
 // control block which points to external global control variables
diff --git a/sm5/scsiprint.h b/sm5/scsiprint.h
index 7b46b4ee7aad5b108dcac8a1ecbb82b8086d6da1..429223ea9c18f3a7b82603506817e7853666e220 100644
--- a/sm5/scsiprint.h
+++ b/sm5/scsiprint.h
@@ -3,11 +3,11 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * Additional SCSI work:
- * Copyright (C) 2003-5 Douglas Gilbert <dougg@torque.net>
+ * Copyright (C) 2003-6 Douglas Gilbert <dougg@torque.net>
  *
  * 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
@@ -30,7 +30,7 @@
 #ifndef SCSI_PRINT_H_
 #define SCSI_PRINT_H_
 
-#define SCSIPRINT_H_CVSID "$Id: scsiprint.h,v 1.19 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define SCSIPRINT_H_CVSID "$Id: scsiprint.h,v 1.20 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 int scsiPrintMain(int fd);
 
diff --git a/sm5/smartctl.c b/sm5/smartctl.c
index 6ccc273034b9741fec505789c7664cb2aba73029..6c0886f64679f1ba2b869832363b337739d95573 100644
--- a/sm5/smartctl.c
+++ b/sm5/smartctl.c
@@ -50,7 +50,7 @@
 extern const char *os_solaris_ata_s_cvsid;
 #endif
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid;
-const char* smartctl_c_cvsid="$Id: smartctl.c,v 1.142 2006/04/05 19:50:07 chrfranke Exp $"
+const char* smartctl_c_cvsid="$Id: smartctl.c,v 1.143 2006/04/12 14:54:28 ballen4705 Exp $"
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
 
 // This is a block containing all the "control variables".  We declare
@@ -69,7 +69,7 @@ void printslogan(){
 #else
   const char * ver = SMARTMONTOOLS_BUILD_HOST;
 #endif
-  pout("smartctl version %s [%s] Copyright (C) 2002-5 Bruce Allen\n", PACKAGE_VERSION, ver);
+  pout("smartctl version %s [%s] Copyright (C) 2002-6 Bruce Allen\n", PACKAGE_VERSION, ver);
   pout("Home page is " PACKAGE_HOMEPAGE "\n\n");
   return;
 }
diff --git a/sm5/smartctl.cpp b/sm5/smartctl.cpp
index 0b74789a2457e2a59a5782fff41fb2a9c0deb4df..c0b890bbb25702302d5c5e631799b8d45ffa3bb2 100644
--- a/sm5/smartctl.cpp
+++ b/sm5/smartctl.cpp
@@ -50,7 +50,7 @@
 extern const char *os_solaris_ata_s_cvsid;
 #endif
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid;
-const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.142 2006/04/05 19:50:07 chrfranke Exp $"
+const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.143 2006/04/12 14:54:28 ballen4705 Exp $"
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
 
 // This is a block containing all the "control variables".  We declare
@@ -69,7 +69,7 @@ void printslogan(){
 #else
   const char * ver = SMARTMONTOOLS_BUILD_HOST;
 #endif
-  pout("smartctl version %s [%s] Copyright (C) 2002-5 Bruce Allen\n", PACKAGE_VERSION, ver);
+  pout("smartctl version %s [%s] Copyright (C) 2002-6 Bruce Allen\n", PACKAGE_VERSION, ver);
   pout("Home page is " PACKAGE_HOMEPAGE "\n\n");
   return;
 }
diff --git a/sm5/smartctl.h b/sm5/smartctl.h
index f6f29e7cb4b601058cc47bd9209dbf2f7fa53378..cba0616564d140db2ae076d0d826a02e4f13a729 100644
--- a/sm5/smartctl.h
+++ b/sm5/smartctl.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #ifndef SMARTCTL_H_
 #define SMARTCTL_H_
 
-#define SMARTCTL_H_CVSID "$Id: smartctl.h,v 1.22 2005/04/20 03:29:59 ballen4705 Exp $\n"
+#define SMARTCTL_H_CVSID "$Id: smartctl.h,v 1.23 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 /* Boolean Values */
 #define TRUE 0x01
diff --git a/sm5/smartd.c b/sm5/smartd.c
index 3e35e4a1cfd9f2f00bf13e0a68d7d1303e21741a..2bb8ba735cdb596b62a463ab7a1cfe7f57b3efa9 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -115,14 +115,14 @@ int getdomainname(char *, int); /* no declaration in header files! */
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-static const char *filenameandversion="$Id: smartd.c,v 1.359 2006/04/05 20:57:12 chrfranke Exp $";
+static const char *filenameandversion="$Id: smartd.c,v 1.360 2006/04/12 14:54:28 ballen4705 Exp $";
 #ifdef NEED_SOLARIS_ATA_CODE
 extern const char *os_solaris_ata_s_cvsid;
 #endif
 #ifdef _WIN32
 extern const char *daemon_win32_c_cvsid, *hostname_win32_c_cvsid, *syslog_win32_c_cvsid;
 #endif
-const char *smartd_c_cvsid="$Id: smartd.c,v 1.359 2006/04/05 20:57:12 chrfranke Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.c,v 1.360 2006/04/12 14:54:28 ballen4705 Exp $" 
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID
 #ifdef DAEMON_WIN32_H_CVSID
 DAEMON_WIN32_H_CVSID
@@ -1065,7 +1065,7 @@ void PrintHead(){
 #else
   const char * ver = SMARTMONTOOLS_BUILD_HOST;
 #endif
-  PrintOut(LOG_INFO,"smartd version %s [%s] Copyright (C) 2002-5 Bruce Allen\n", PACKAGE_VERSION, ver);
+  PrintOut(LOG_INFO,"smartd version %s [%s] Copyright (C) 2002-6 Bruce Allen\n", PACKAGE_VERSION, ver);
   PrintOut(LOG_INFO,"Home page is " PACKAGE_HOMEPAGE "\n\n");
   return;
 }
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
index 509701b34332b273e049dd5f68bfaf3dfd4aa8b7..efb356edf0b24f9426797f11ffd37b986245ed1f 100644
--- a/sm5/smartd.cpp
+++ b/sm5/smartd.cpp
@@ -115,14 +115,14 @@ int getdomainname(char *, int); /* no declaration in header files! */
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-static const char *filenameandversion="$Id: smartd.cpp,v 1.359 2006/04/05 20:57:12 chrfranke Exp $";
+static const char *filenameandversion="$Id: smartd.cpp,v 1.360 2006/04/12 14:54:28 ballen4705 Exp $";
 #ifdef NEED_SOLARIS_ATA_CODE
 extern const char *os_solaris_ata_s_cvsid;
 #endif
 #ifdef _WIN32
 extern const char *daemon_win32_c_cvsid, *hostname_win32_c_cvsid, *syslog_win32_c_cvsid;
 #endif
-const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.359 2006/04/05 20:57:12 chrfranke Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.360 2006/04/12 14:54:28 ballen4705 Exp $" 
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID
 #ifdef DAEMON_WIN32_H_CVSID
 DAEMON_WIN32_H_CVSID
@@ -1065,7 +1065,7 @@ void PrintHead(){
 #else
   const char * ver = SMARTMONTOOLS_BUILD_HOST;
 #endif
-  PrintOut(LOG_INFO,"smartd version %s [%s] Copyright (C) 2002-5 Bruce Allen\n", PACKAGE_VERSION, ver);
+  PrintOut(LOG_INFO,"smartd version %s [%s] Copyright (C) 2002-6 Bruce Allen\n", PACKAGE_VERSION, ver);
   PrintOut(LOG_INFO,"Home page is " PACKAGE_HOMEPAGE "\n\n");
   return;
 }
diff --git a/sm5/smartd.h b/sm5/smartd.h
index d96b806e6d337d6ea4a5d5ca27297614cdb143d6..c1b5dd195d394a1c666f8690b786dcbe747e5983 100644
--- a/sm5/smartd.h
+++ b/sm5/smartd.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 
 
 #ifndef SMARTD_H_CVSID
-#define SMARTD_H_CVSID "$Id: smartd.h,v 1.75 2005/04/20 03:30:17 ballen4705 Exp $\n"
+#define SMARTD_H_CVSID "$Id: smartd.h,v 1.76 2006/04/12 14:54:28 ballen4705 Exp $\n"
 #endif
 
 // Configuration file
diff --git a/sm5/smartd.initd.in b/sm5/smartd.initd.in
index bae2e2a028f0129d49c735550faf7d3185be7a2f..c267f91b1b198c4732f93a39c96b19e05f81cff6 100755
--- a/sm5/smartd.initd.in
+++ b/sm5/smartd.initd.in
@@ -1,8 +1,8 @@
 #! /bin/sh
 
 # smartmontools init file for smartd
-# Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
-# $Id: smartd.initd.in,v 1.32 2005/12/11 18:40:35 ballen4705 Exp $
+# Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+# $Id: smartd.initd.in,v 1.33 2006/04/12 14:54:28 ballen4705 Exp $
 
 # For RedHat and cousins:
 # chkconfig: 2345 40 40
diff --git a/sm5/smartmontools.spec b/sm5/smartmontools.spec
index 268a42bf8a434ed9329090c1e5684af798cb27ea..d02bf02ad44a6addd33923b4dc2d2949b6702649 100644
--- a/sm5/smartmontools.spec
+++ b/sm5/smartmontools.spec
@@ -35,9 +35,9 @@ Packager:       Bruce Allen <smartmontools-support@lists.sourceforge.net>
 # http://ftp1.sourceforge.net/smartmontools/smartmontools-%{version}-%{release}.tar.gz
 
 # CVS ID of this file is:
-# $Id: smartmontools.spec,v 1.165 2005/04/20 07:38:44 ballen4705 Exp $
+# $Id: smartmontools.spec,v 1.166 2006/04/12 14:54:28 ballen4705 Exp $
 
-# Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+# Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 # Home page: http://smartmontools.sourceforge.net/
 #
 # This program is free software; you can redistribute it and/or modify it
diff --git a/sm5/utility.c b/sm5/utility.c
index 679f84c5c52431eca8012b1ac06b2eb8c917aa5b..19c9f80524eb7143998d49f91aecee88e0a1da54 100644
--- a/sm5/utility.c
+++ b/sm5/utility.c
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,7 @@
 #include "utility.h"
 
 // Any local header files should be represented by a CVSIDX just below.
-const char* utility_c_cvsid="$Id: utility.c,v 1.60 2005/11/27 20:22:03 chrfranke Exp $"
+const char* utility_c_cvsid="$Id: utility.c,v 1.61 2006/04/12 14:54:28 ballen4705 Exp $"
 CONFIG_H_CVSID INT64_H_CVSID UTILITY_H_CVSID;
 
 const char * packet_types[] = {
diff --git a/sm5/utility.cpp b/sm5/utility.cpp
index 722b03e4f51a8cd9c25794507b24831f284e52b3..1a4dc5db3478ca1a85c74d880418dd23c82d62ee 100644
--- a/sm5/utility.cpp
+++ b/sm5/utility.cpp
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,7 @@
 #include "utility.h"
 
 // Any local header files should be represented by a CVSIDX just below.
-const char* utility_c_cvsid="$Id: utility.cpp,v 1.60 2005/11/27 20:22:03 chrfranke Exp $"
+const char* utility_c_cvsid="$Id: utility.cpp,v 1.61 2006/04/12 14:54:28 ballen4705 Exp $"
 CONFIG_H_CVSID INT64_H_CVSID UTILITY_H_CVSID;
 
 const char * packet_types[] = {
diff --git a/sm5/utility.h b/sm5/utility.h
index 96eb6233dffae6134aa0a0e5e0961fab32fcf2ba..7229c5a6b7a0f5630a3c95f9bcdb6f0289cfef29 100644
--- a/sm5/utility.h
+++ b/sm5/utility.h
@@ -3,7 +3,7 @@
  *
  * Home page of code is: http://smartmontools.sourceforge.net
  *
- * Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #ifndef UTILITY_H_
 #define UTILITY_H_
 
-#define UTILITY_H_CVSID "$Id: utility.h,v 1.42 2005/04/20 03:30:17 ballen4705 Exp $\n"
+#define UTILITY_H_CVSID "$Id: utility.h,v 1.43 2006/04/12 14:54:28 ballen4705 Exp $\n"
 
 #include <time.h>
 #include <sys/types.h> // for regex.h (according to POSIX)