diff -Nru gnutls26-2.12.23/debian/changelog gnutls26-2.12.23/debian/changelog
--- gnutls26-2.12.23/debian/changelog	2014-05-07 23:07:56.000000000 +0000
+++ gnutls26-2.12.23/debian/changelog	2014-06-01 15:03:13.000000000 +0000
@@ -1,3 +1,12 @@
+gnutls26 (2.12.23-15ubuntu2) utopic; urgency=medium
+
+  * SECURITY UPDATE: memory corruption due to server hello parsing
+    - debian/patches/CVE-2014-3466.patch: validate session_id_len in
+      lib/gnutls_handshake.c.
+    - CVE-2014-3466
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Sun, 01 Jun 2014 11:02:11 -0400
+
 gnutls26 (2.12.23-15ubuntu1) utopic; urgency=medium
 
   * Merge with Debian; remaining changes:
diff -Nru gnutls26-2.12.23/debian/patches/CVE-2014-3466.patch gnutls26-2.12.23/debian/patches/CVE-2014-3466.patch
--- gnutls26-2.12.23/debian/patches/CVE-2014-3466.patch	1970-01-01 00:00:00.000000000 +0000
+++ gnutls26-2.12.23/debian/patches/CVE-2014-3466.patch	2014-06-01 15:02:07.000000000 +0000
@@ -0,0 +1,26 @@
+From 89238044ade02c4d80e334ab74056ef28599663d Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Fri, 23 May 2014 19:53:03 +0200
+Subject: [PATCH] Prevent memory corruption due to server hello parsing.
+
+Issue discovered by Joonas Kuorilehto of Codenomicon.
+---
+ lib/gnutls_handshake.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
+index e4a63e4..e652528 100644
+--- a/lib/gnutls_handshake.c
++++ b/lib/gnutls_handshake.c
+@@ -1797,7 +1797,7 @@ _gnutls_read_server_hello (gnutls_session_t session,
+   DECR_LEN (len, 1);
+   session_id_len = data[pos++];
+ 
+-  if (len < session_id_len)
++  if (len < session_id_len || session_id_len > TLS_MAX_SESSION_ID_SIZE)
+     {
+       gnutls_assert ();
+       return GNUTLS_E_UNSUPPORTED_VERSION_PACKET;
+-- 
+1.7.1
+
diff -Nru gnutls26-2.12.23/debian/patches/series gnutls26-2.12.23/debian/patches/series
--- gnutls26-2.12.23/debian/patches/series	2014-05-07 22:56:27.000000000 +0000
+++ gnutls26-2.12.23/debian/patches/series	2014-06-01 15:02:07.000000000 +0000
@@ -10,3 +10,4 @@
 28_use_gnutls_global_set_time.diff
 link-pthread.diff
 99_update-libtool.patch
+CVE-2014-3466.patch