diff -u qemu-kvm-0.12.5+noroms/debian/changelog qemu-kvm-0.12.5+noroms/debian/changelog
--- qemu-kvm-0.12.5+noroms/debian/changelog
+++ qemu-kvm-0.12.5+noroms/debian/changelog
@@ -1,3 +1,13 @@
+qemu-kvm (0.12.5+noroms-0ubuntu7.2) maverick; urgency=low
+
+  * SECURITY UPDATE: Setting VNC password to empty string silently
+    disables all authentication (LP: #697197)
+    - debian/patches/697197-fix-vnc-password-semantics.patch: Reverses the
+    change introduced in Qemu by git commit 52c18be9 
+    CVE: 2011-0011
+
+ -- Neil Wilson <neil@aldur.co.uk>  Fri, 28 Jan 2011 15:30:44 +0000
+
 qemu-kvm (0.12.5+noroms-0ubuntu7.1) maverick-proposed; urgency=low
 
   * Add caps-lock-key-up-event.patch to enable normal up/down events for
diff -u qemu-kvm-0.12.5+noroms/debian/patches/series qemu-kvm-0.12.5+noroms/debian/patches/series
--- qemu-kvm-0.12.5+noroms/debian/patches/series
+++ qemu-kvm-0.12.5+noroms/debian/patches/series
@@ -11,0 +12 @@
+697197-fix-vnc-password-semantics.patch
only in patch2:
unchanged:
--- qemu-kvm-0.12.5+noroms.orig/debian/patches/697197-fix-vnc-password-semantics.patch
+++ qemu-kvm-0.12.5+noroms/debian/patches/697197-fix-vnc-password-semantics.patch
@@ -0,0 +1,17 @@
+## Description: Stop 'change password' switching off VNC authentication
+## Origin/Author: Neil Wilson <neil@aldur.co.uk>
+## Bug: http://launchpad.net/bugs/697197
+--- a/vnc.c
++++ b/vnc.c
+@@ -2461,11 +2461,6 @@
+     if (password && password[0]) {
+         if (!(vs->password = qemu_strdup(password)))
+             return -1;
+-        if (vs->auth == VNC_AUTH_NONE) {
+-            vs->auth = VNC_AUTH_VNC;
+-        }
+-    } else {
+-        vs->auth = VNC_AUTH_NONE;
+     }
+ 
+     return 0;