diff --git a/CHANGES b/CHANGES
index 85e50a0f21e86c87a803c1000149c9ffe52800d5..7239fbde2c697d4733584430f94313c62eededad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,26 @@
+0.50 - Wed 8 August 2007
+
+- Add DROPBEAR_PASSWORD environment variable to specify a dbclient password
+
+- Use /dev/urandom by default, since that's what everyone does anyway
+
+- Correct vfork() use for uClinux in scp
+  (thanks to Alex Landau)
+
+- Exit with an exit code of 1 if dropbear can't bind to any ports
+  (thanks to Nicolai Ehemann)
+
+- Improve network performance and add a -W <receive_window> argument for
+  adjusting the tradeoff between network performance and memory consumption.
+
+- Fix a problem where reply packets could be sent during key exchange,
+  in violation of the SSH spec. This could manifest itself with connections
+  being terminated after 8 hours with new TCP-forward connections being
+  established.
+
+- Add -K <keepalive_time> argument, ensuring that data is transmitted
+  over the connection at least every N seconds.
+
 0.49 - Fri 23 February 2007
 
 - Security: dbclient previously would prompt to confirm a 
diff --git a/debian/changelog b/debian/changelog
index 0ad67efe5caf5238942ad20e1b0ebb67efc7b5dc..e7d4141d96701bf70ddd3d1b8344774bf300abcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dropbear (0.50-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matt Johnston <matt@ucc.asn.au>  Wed, 8 Aug 2007 11:22:33 +0800
+
 dropbear (0.49-0.1) unstable; urgency=low
 
   * New upstream release.
diff --git a/options.h b/options.h
index 722a43ac2bbec7b85315390c34c6b8694450d483..a05ae35d9caa2c34219ea872b3d79577b48e5662 100644
--- a/options.h
+++ b/options.h
@@ -240,7 +240,7 @@ be overridden at runtime with -K. 0 disables keepalives */
  *******************************************************************/
 
 #ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "0.49"
+#define DROPBEAR_VERSION "0.50"
 #endif
 
 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION