diff --git a/CHANGES b/CHANGES
index 41d25ba234ed043bb754bf781baa576fa7186375..f58ed7e6e634fce59ae1b859d014cd80390997c9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,21 +1,50 @@
-0.49 - Tues 13 June 2003
-
-- Return immediately for "sleep 10 & echo foo", rather than waiting
-  for the sleep to return (pointed out by Rob Landley)
-
-- Added -P pidfile argument to the server (from Swen Schillig)
+0.49test1 - Mon 12 February 2007
 
 - Compile fixes, make sure that all variable definitions are at the start
   of a scope.
 
-- Use $HOME in preference to that from /etc/passwd, so that it
-  dbclient can still work on systems with a broken setup.
+- Added -P pidfile argument to the server (from Swen Schillig)
 
 - Add -N dbclient option for "no command"
 
 - Add -f dbclient option for "background after auth"
 
-- Try to finally fix ss_family compilation problems
+- Try to finally fix ss_family compilation problems (for old
+  glibc systems)
+
+- Fix finding relative-path server hostkeys when running daemonized
+
+- Use $HOME in preference to that from /etc/passwd, so that
+  dbclient can still work on broken systems.
+
+- Fix various issues found by Klocwork defect analysis, mostly memory leaks
+  and error-handling. Thanks to Klocwork for their service.
+
+- Improve building in a separate directory
+
+- Add compile-time LOG_COMMANDS option to log user commands
+
+- Add '-y' flag to dbclient to unconditionally accept host keys,
+  patch from Luciano Miguel Ferreira Rocha
+
+- Return immediately for "sleep 10 & echo foo", rather than waiting
+  for the sleep to return (pointed out by Rob Landley).
+  
+- Avoid hanging after exit in certain cases (such as scp)
+
+- Various minor fixes, in particular various leaks reported by
+  Erik Hovland
+  
+- Disable core dumps on startup
+
+- Don't erase over every single buffer, since it was a bottleneck.
+  On systems where it really matters, encrypted swap should be utilised.
+
+- Read /dev/[u]random only once at startup to conserve kernel entropy
+
+- Upgrade to LibTomCrypt 1.16 and LibTomMath 0.40
+
+- Upgrade config.status and config.guess 
 
 0.48.1 - Sat 11 March 2006
 
diff --git a/debian/changelog b/debian/changelog
index acebcef9ededd858e49805a09658cb0dc206bd73..d201176654046a1d07145e3605f30b3729928ae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-dropbear (0.49-0.1) unstable; urgency=low
+dropbear (0.49test1-0.1) unstable; urgency=low
 
   * New upstream release.
 
- -- Matt Johnston <matt@ucc.asn.au>  Tues, 13 June 2005 19:20:21 +0800
+ -- Matt Johnston <matt@ucc.asn.au>  Mon, 12 Feb 2007 23:59:00 +0900
 
 dropbear (0.48.1-1) unstable; urgency=medium
 
diff --git a/options.h b/options.h
index ad82f8b2b26ae7b649e9eb5a3fcc1e4940551a4c..a8f45d47729618df114f245043fc4f7921c6d8ed 100644
--- a/options.h
+++ b/options.h
@@ -209,7 +209,7 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
  *******************************************************************/
 
 #ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "0.49"
+#define DROPBEAR_VERSION "0.49test1"
 #endif
 
 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION