diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 53611bcaf60935e2e59cd607f05493863b8e1a89..a0d86be23fdcf1287752e170e272f9e0e8f73e4e 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.535 2006/04/12 14:54:28 ballen4705 Exp $
+$Id: CHANGELOG,v 1.536 2006/04/12 15:46:30 ballen4705 Exp $
 
 The most recent version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
@@ -10,6 +10,7 @@ Maintainers / Developers Key:
 [EB] Erik Inge Bols�
 [SB] Stanislav Brabec
 [PC] Peter Cassidy
+[YD] Yuri Dario
 [CD] Casper Dik
 [CF] Christian Franke
 [GF] Guilhem Fr�zou
@@ -26,13 +27,12 @@ Maintainers / Developers Key:
 [PW] Phil Williams
 [LW] Leon Woestenberg
 [RZ] Richard Zybert
-[YD] Yuri Dario
 
 NOTES FOR FUTURE RELEASES: see TODO file.
 
-<ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
+<DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
-smartmontools 5.34 Stable Release
+smartmontools 5.36 Stable Release
 
   [BA] Update copyright dates to 2006.
 
@@ -116,6 +116,8 @@ smartmontools 5.34 Stable Release
   [CF] Windows: Fixed unsupported 'smartctl -X' on Win2000/XP by using
        IOCTL_IDE_PASS_THROUGH instead.
 
+smartmontools 5.34 Stable Release [NOTE: never officially released]
+
   [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 8c9f79923d49b6df0c2064711ec0d930b59cda2f..21aaf9e14b2db12d0909001bcabc84761e0e6b24 100644
--- a/sm5/NEWS
+++ b/sm5/NEWS
@@ -1,10 +1,29 @@
 smartmontools NEWS
 ------------------
-CVS ID: $Id: NEWS,v 1.28 2005/04/20 07:38:44 ballen4705 Exp $
+CVS ID: $Id: NEWS,v 1.29 2006/04/12 15:46:30 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 2006-04-12
+Summary: smartmontools release 5.36 (STABLE)
+-----------------------------------------------------------
+This is a stable smartmontools release.  The 5.34 version
+described just below was never officially released because
+Bruce Allen decided to wait until Linux support for
+accessing SATA devices through libata was in the official
+kernel.org sources.  Changes include:
+
+- Win 2000/XP:ability to cancel drive self-tests
+- Additions to the table of known drives
+- FreeBSD support for 3ware char device interface and
+  multiple 3ware cards
+- Various cygwin improvements for running as service
+- Works 'out of the box' with Linux SATA libata
+- smartd option added to list test schedules
+- smartctl option added to list part of drive database
+- various improvements for SCSI disks and logs
+
 
 Date 2005-04-19
 Summary: smartmontools release 5.34 (STABLE)
diff --git a/sm5/do_release b/sm5/do_release
index 4320992d7932aaa167e809086704b389e4168719..b89b852c347b5813702fb3ac9df628b302a36509 100755
--- a/sm5/do_release
+++ b/sm5/do_release
@@ -3,15 +3,17 @@
 # do a smartmontools release
 # (C) 2003-6 Bruce Allen <ballen4705@users.sourceforge.net>, 
 #          Guido Guenther <agx@sigxcpu.org>
-# $Id: do_release,v 1.35 2006/04/12 14:54:28 ballen4705 Exp $
+# $Id: do_release,v 1.36 2006/04/12 15:46:30 ballen4705 Exp $
 
 # Notes on generating releases:
 # (1) update NEWS
 # (2) update CHANGELOG -- put in release number
 # (3) update release number in configure.in and smartmontools.spec
 # (4) update internal changelog in smartmontools.spec
+# (5) to test, set USECVS below to 0
+# (6) when satisfied, set USECVS below to 1
 
-USECVS=1
+USECVS=0
 
 KEYID=0x841ABAE8