diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index fb399220c89bea6b35c4d7a4a6d5458b4792b3b3..4d0ad4f6aed73d011a8a37106b741b48b7deabf9 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.509 2005/04/08 19:17:52 chrfranke Exp $
+$Id: CHANGELOG,v 1.510 2005/04/20 07:38:43 ballen4705 Exp $
 
 The most recent version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
@@ -32,6 +32,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
 
+smartmontools 5.34 Stable Release
+
   [CF] Cygwin & Windows smartd: Increased SCSI DEVICESCAN range
        from ASPI adapter 0-3 to 0-9. Added diagnostic messages.
 
diff --git a/sm5/NEWS b/sm5/NEWS
index 7e17569f3ee8e62a4f6523566cf7d18569b3ccfc..8c9f79923d49b6df0c2064711ec0d930b59cda2f 100644
--- a/sm5/NEWS
+++ b/sm5/NEWS
@@ -1,15 +1,19 @@
 smartmontools NEWS
 ------------------
-CVS ID: $Id: NEWS,v 1.27 2004/11/06 18:04:03 chrfranke Exp $
+CVS ID: $Id: NEWS,v 1.28 2005/04/20 07:38:44 ballen4705 Exp $
 
 The most up-to-date version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/NEWS?sortby=date&view=markup
 
 
-Date <Not released yet>
+Date 2005-04-19
 Summary: smartmontools release 5.34 (STABLE)
 -----------------------------------------------------------
+This is a stable smartmontools release.  It includes:
+- OS/2 and eComStation support
 All Platforms:
+ - Printing of drive family info
+ - SCSI disks: output size of grown defect list
  - Added info about drive family to 'smartctl -i' output.
  - Added option ',q' for smartd '-n' directive to suppress
    'skipping checks' message which may spin up laptop disk.
@@ -23,6 +27,7 @@ Cygwin and Windows:
 Windows:
  - Fixed bug that prevents running smartd as service on WinNT4.
 
+
 Date 2004-9-5
 Summary: smartmontools release 5.33 (UNSTABLE/EXPERIMENTAL)
 -----------------------------------------------------------
diff --git a/sm5/autogen.sh b/sm5/autogen.sh
index 5a26c49f23cf025d8097d6d9b8f8d459978ef352..189b93dac94d3513a72eb318a0eaf77a3def6d5a 100755
--- a/sm5/autogen.sh
+++ b/sm5/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: autogen.sh,v 1.10 2004/11/06 16:00:39 chrfranke Exp $
+# $Id: autogen.sh,v 1.11 2005/04/20 07:38:44 ballen4705 Exp $
 #
 # Generate ./configure from config.in and Makefile.in from Makefile.am.
 # This also adds files like missing,depcomp,install-sh to the source
@@ -70,7 +70,7 @@ case "$AUTOMAKE" in
     ver="`$AUTOMAKE --version | head -1 | sed -n 's,^.*\([12]\.[.0-9]*[-pl0-9]*\).*$,\1,p'`"
     ver="${ver:-?.?.?}"
     case "$ver" in
-      1.[78]*|1.9.[12]) ver= ;;
+      1.[78]*|1.9.[123]) ver= ;;
     esac ;;
 esac
 
diff --git a/sm5/configure.in b/sm5/configure.in
index 7b82505c876feef455f2cfb82307e9e0afaea686..df78f83f6232aa6bccea3f472772b9f978c83fa3 100644
--- a/sm5/configure.in
+++ b/sm5/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.110 2004/12/01 15:10:43 chrfranke Exp $
+# $Id: configure.in,v 1.111 2005/04/20 07:38:44 ballen4705 Exp $
 #
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.50)
@@ -7,9 +7,9 @@ AC_INIT(smartmontools, 5.34, smartmontools-support@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(smartctl.c)
 
 smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
-smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.110 2004/12/01 15:10:43 chrfranke Exp $'`
-smartmontools_release_date=2004/09/10
-smartmontools_release_time="04:11:35 UTC"
+smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.111 2005/04/20 07:38:44 ballen4705 Exp $'`
+smartmontools_release_date=2005/04/20
+smartmontools_release_time="04:56:06 UTC"
 
 AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_ARGS, "$ac_configure_args",            [smartmontools Configure Arguments])
 AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_DATE, "$smartmontools_configure_date", [smartmontools Configure Date])
diff --git a/sm5/do_release b/sm5/do_release
index 89096fba9120410a43fa045f7539d081f9cd9685..f570299a4c13d04a1721e0dcd04573185d3bc0f8 100755
--- a/sm5/do_release
+++ b/sm5/do_release
@@ -3,7 +3,7 @@
 # do a smartmontools release
 # (C) 2003-5 Bruce Allen <ballen4705@users.sourceforge.net>, 
 #          Guido Guenther <agx@sigxcpu.org>
-# $Id: do_release,v 1.33 2005/04/20 03:29:58 ballen4705 Exp $
+# $Id: do_release,v 1.34 2005/04/20 07:38:44 ballen4705 Exp $
 
 # Notes on generating releases:
 # (1) update NEWS
@@ -13,7 +13,7 @@
 
 USECVS=1
 
-KEYID=0x9BB19A22
+KEYID=0x841ABAE8
 
 if [ -f /etc/redhat-release ]; then
   RPM_BASE=/usr/src/redhat/
diff --git a/sm5/smartctl.8.in b/sm5/smartctl.8.in
index abadcbfac241298d84df483c9f8a4671d2abb599..b8aeb9613be315c2eee43f5983ab61adc0a9ed69 100644
--- a/sm5/smartctl.8.in
+++ b/sm5/smartctl.8.in
@@ -1,7 +1,7 @@
 .ig
  Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 
- $Id: smartctl.8.in,v 1.74 2005/04/20 03:29:59 ballen4705 Exp $
+ $Id: smartctl.8.in,v 1.75 2005/04/20 07:38:44 ballen4705 Exp $
  
  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
@@ -201,8 +201,11 @@ where in the argument \fI3ware,N\fP, the integer N is the disk number
 values of N are from 0 to 15 inclusive.  The first two forms, which
 refer to devices /dev/sda-z and /dev/twe0-15, may be used with 3ware
 series 6000, 7000, and 8000 series controllers that use the 3x-xxxx
-driver.  The final form, which refers to devices /dev/twa0-15, must be
-used with 3ware 9000 series controllers, which use the 3w-9xxx driver.
+driver.  \fBNote that the /dev/sda-z form is deprecated\fP starting
+with the Linux 2.6 kernel series and may not be supported by the Linux
+kernel in the near future. The final form, which refers to devices
+/dev/twa0-15, must be used with 3ware 9000 series controllers, which
+use the 3w-9xxx driver.
 
 Note that if the special character device nodes /dev/twa? and
 /dev/twe? do not exist, or exist with the incorrect major or minor
@@ -1111,6 +1114,18 @@ Examine all SMART data for the first ATA disk connected to a 3ware
 RAID controller card.
 .PP
 .nf
+.B smartctl \-a \-d 3ware,0 /dev/twe0
+.fi
+Examine all SMART data for the first ATA disk connected to a 3ware
+RAID 6000/7000/8000 controller card.
+.PP
+.nf
+.B smartctl \-a \-d 3ware,0 /dev/twa0
+.fi
+Examine all SMART data for the first ATA disk connected to a 3ware
+RAID 9000 controller card.
+.PP
+.nf
 .B smartctl \-t short \-d 3ware,3 /dev/sdb
 .fi
 Start a short self\-test on the fourth ATA disk connected to the 3ware RAID
@@ -1250,7 +1265,7 @@ these documents may be found in the References section of the
 
 .SH
 CVS ID OF THIS PAGE:
-$Id: smartctl.8.in,v 1.74 2005/04/20 03:29:59 ballen4705 Exp $
+$Id: smartctl.8.in,v 1.75 2005/04/20 07:38:44 ballen4705 Exp $
 .\" Local Variables:	         
 .\" mode: nroff         
 .\" End:
diff --git a/sm5/smartmontools.spec b/sm5/smartmontools.spec
index 384016845faf335017cb4d756a3a9fbd0377e32f..268a42bf8a434ed9329090c1e5684af798cb27ea 100644
--- a/sm5/smartmontools.spec
+++ b/sm5/smartmontools.spec
@@ -35,7 +35,7 @@ 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.164 2005/04/20 03:30:17 ballen4705 Exp $
+# $Id: smartmontools.spec,v 1.165 2005/04/20 07:38:44 ballen4705 Exp $
 
 # Copyright (C) 2002-5 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 # Home page: http://smartmontools.sourceforge.net/
@@ -324,6 +324,99 @@ fi
 # [PW] Phil Williams
 
 %changelog
+* Tue Apr 20 2005 Bruce Allen  <smartmontools-support@lists.sourceforge.net>
+  [CF] Cygwin & Windows smartd: Increased SCSI DEVICESCAN range
+       from ASPI adapter 0-3 to 0-9. Added diagnostic messages.
+  [CF] Windows smartd: Added ability to run .bat files via '-M exec'
+       directive.
+  [CF] Cygwin smartd: Added FreeConsole() after fork() to avoid hang
+       of terminated shell console window.
+  [DG] [SCSI] Add code so 'smartctl -A' outputs the number of elements
+       in the grown defect list. When this number is increasing a
+       disk has problems. N.B. Similar logic should be added to smartd.
+  [CF] Windows smartd: Fixed event handling to allow start of another
+       smartd process when service is already running. Useful for testing
+       service configuration changes in debug mode.
+  [PW] Added following drives to knowndrives table: Western Digital Raptor
+       family, Seagate Barracuda 7200.8 family, Maxtor DiamondMax 2160
+       Ultra ATA and DiamondMax 10 families, Hitachi Travelstar E7K60
+       family, Seagate Medalist 17240, 13030, 10231, 8420, and 4310,
+       TOSHIBA MK4018GAP and MK6022GAX, ExcelStor Technology J360, and
+       Western Digital Caviar AC14300.
+  [PW] Added missing Fujitsu MHTxxxxAT and Seagate Barracuda 7200.7 drives
+       to knowndrives table.
+  [PW] Added QUANTUM FIREBALLP LM10.2 to knowndrives table.  Thanks to
+       Mike Fleetwood for submitting the patch.
+  [KS] Solaris/SPARC: fixed not to disable automatic offline test and
+       automatic save attributes incorrectly.  Thanks to Roy Badami.
+  [BA] Linux: smartd init script now recognizes 'trustix' distro.
+  [DG] [SCSI] Medium and hardware errors were slipping through
+       unreported. Fix linux SCSI sense reporting via SG_IO ioctl.
+  [DG] [SCSI] Change lba of first failure in selftest output to
+       decimal (was hex) to conform with ATA output.
+  [GK] smartd: Detect most self-test failures even if the hour counter
+       has wrapped.
+  [BA] smartctl: list 'marvell' as option if user give invalid
+       -d argument
+  [CF] Windows: fixed SCSI timeout handling to allow long timeouts
+       for selftests.
+  [CF] Fixed buffer overflow issues in printone() and safe_vsnprintf()
+       which results in crash on -V option (at least on Windows).
+  [DG] [SCSI] Add explicit timeouts to INQUIRY and REQUEST SENSE (that
+       were missed in an earlier patch). Could have impacted freebsd.
+  [DG] When linux detects a sata_via_libata disk suggest that user try
+       '-d ata' (rather then '-d libata). Anticipate kernel change.
+  [YD] Added OS/2 and eComStation platform support.
+  [PW] Added Seagate U4 family, Fujitsu MHJ and MHK families, Seagate
+       Barracuda 5400.1, QUANTUM FIREBALLP KX27.3, QUANTUM FIREBALLP KA10.1,
+       and ExcelStor J340 to knowndrives table.
+  [DG] [SCSI] After report of Hitachi IC35L073UCDY10 disks locking up
+       on log page 0x7 (last n error events), check log page (and some
+       others) is supported (via log page 0x0) before probing.
+  [CF] Added safe_v?snprintf() for platforms using v?snprintf()
+       with non standard behaviour on overflow (Windows, old Linux)
+  [CF] smartd: Added message if check power mode spins up disk.
+  [CF] Windows: Added support for READ_LOG on WinNT4 using undocumented
+       pseudo SCSI command via IOCTL_SCSI_PASS_THROUGH.
+  [CF] smartd: Added ',q' option for '-n' directive to suppress 'skipping
+       checks' log message. This prevents a laptop disk from spinning up
+       due to this message. Thanks to Rob MacLachlan and Manfred Schwarb
+       for pointing out problem & solution.
+  [CF] Windows: Added function get_os_version_str() to show OS flavor in
+       copyright message.
+  [CF] Windows: Added function ata_identify_is_cached() to check for outdated
+       SMART enabled bit in identify data.
+  [CF] Windows: Added fix to prevent linkage of smartd specific win32 modules
+       to smartctl.
+  [PW] Added Fujitsu MPG3153AH, Hitachi Endurastar J4K20/N4K20 (formerly
+       DK23FA-20J), Seagate Momentus family, and Maxtor Fireball 3 family
+       to knowndrives table.
+  [PW] Added missing Maxtor DiamondMax 16, Seagate Barracuda ATA IV, and
+       Western Digital Caviar WDxxxAA/WDxxxBA drives to knowndrives table.
+  [CF] Windows: Added ATA check power mode for smartd -n directive.
+  [CF] Windows: Fixed use of new service status flag which causes hang
+       of smartd service on WinNT4.
+  [CF] Windows: Fixed error checking of IOCTL_IDE_PASS_THROUGH (used
+       for READ_LOG on 2000/XP). Added some diagnostic messages on
+       -r ataioctl[,2]. Thanks to Manfred Schwarb for bug report and testing.
+  [BA] Fixed code bug that made it impossible to enable SMART on
+       disks with failing health status.  This would happen if the
+       os_*.c author made STATUS and STATUS_CHECK work the same way.
+       I have corrected this at a higher level; we now handle the
+       case where STATUS and STATUS_CHECK are identical without
+       issues. 
+  [LW] Make os_linux.c/marvell_command_interface() always return 0 on STATUS.
+       Needed for a disk having bad SMART status.
+  [CF] smartctl: Added drive family printing.
+  [CF] autogen.sh: Allow automake 1.9, added message if automake
+       version is unknown.
+  [BA] smartctl: use locale-specific separators for printing disk
+       capacity.  Also use AC_CHECK_HEADERS not AC_CHECK_HEADER in
+       configure.in.
+  [BA] clean-up of #include structure so that -V options to smartd
+       and smartctl work correctly.  Please, don't #include header
+       files into other header files.
+
 * Fri Sep 10 2004 Bruce Allen  <smartmontools-support@lists.sourceforge.net>
   [BA] smartctl: ATA disks, if SMART ATTRIBUTE THRESHOLDS page has ID
        errors with some Attributes having NULL IDs, print Attribute