diff -Nru chromium-browser-37.0.2062.120/debian/changelog chromium-browser-37.0.2062.120/debian/changelog
--- chromium-browser-37.0.2062.120/debian/changelog	2014-09-16 13:33:56.000000000 +0000
+++ chromium-browser-37.0.2062.120/debian/changelog	2016-02-24 18:45:10.000000000 +0000
@@ -1,3 +1,10 @@
+chromium-browser (37.0.2062.120-0ubuntu0.12.04.2) precise-security; urgency=medium
+
+  * debian/patches/nss-321-fix.patch: fix compatibility with nss 3.21.
+    (LP: #1520568)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 24 Feb 2016 13:42:57 -0500
+
 chromium-browser (37.0.2062.120-0ubuntu0.12.04.1~pkg917) precise-security; urgency=medium
 
   * Release to stage
diff -Nru chromium-browser-37.0.2062.120/debian/patches/nss-321-fix.patch chromium-browser-37.0.2062.120/debian/patches/nss-321-fix.patch
--- chromium-browser-37.0.2062.120/debian/patches/nss-321-fix.patch	1970-01-01 00:00:00.000000000 +0000
+++ chromium-browser-37.0.2062.120/debian/patches/nss-321-fix.patch	2016-02-24 18:44:57.000000000 +0000
@@ -0,0 +1,30 @@
+Description: fix compatibility with nss 3.21
+Author: Marc Deslauriers <marc.deslauriers@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/1520568
+
+Index: chromium-browser-37.0.2062.120/net/third_party/nss/patches/chacha20poly1305.patch
+===================================================================
+--- chromium-browser-37.0.2062.120.orig/net/third_party/nss/patches/chacha20poly1305.patch	2014-09-09 19:29:24.000000000 -0400
++++ chromium-browser-37.0.2062.120/net/third_party/nss/patches/chacha20poly1305.patch	2016-02-24 13:40:13.202659710 -0500
+@@ -8,7 +8,7 @@
+ +/* This is a bodge to allow this code to be compiled against older NSS
+ + * headers. */
+ +#ifndef CKM_NSS_CHACHA20_POLY1305
+-+#define CKM_NSS_CHACHA20_POLY1305               (CKM_NSS + 26)
+++#define CKM_NSS_CHACHA20_POLY1305               (CKM_NSS + 28)
+ +
+ +typedef struct CK_NSS_AEAD_PARAMS {
+ +    CK_BYTE_PTR  pIv;  /* This is the nonce. */
+Index: chromium-browser-37.0.2062.120/net/third_party/nss/ssl/ssl3con.c
+===================================================================
+--- chromium-browser-37.0.2062.120.orig/net/third_party/nss/ssl/ssl3con.c	2014-09-09 19:29:24.000000000 -0400
++++ chromium-browser-37.0.2062.120/net/third_party/nss/ssl/ssl3con.c	2016-02-24 13:40:36.262859482 -0500
+@@ -43,7 +43,7 @@
+ /* This is a bodge to allow this code to be compiled against older NSS
+  * headers. */
+ #ifndef CKM_NSS_CHACHA20_POLY1305
+-#define CKM_NSS_CHACHA20_POLY1305               (CKM_NSS + 26)
++#define CKM_NSS_CHACHA20_POLY1305               (CKM_NSS + 28)
+ 
+ typedef struct CK_NSS_AEAD_PARAMS {
+     CK_BYTE_PTR  pIv;  /* This is the nonce. */
diff -Nru chromium-browser-37.0.2062.120/debian/patches/series chromium-browser-37.0.2062.120/debian/patches/series
--- chromium-browser-37.0.2062.120/debian/patches/series	2014-09-16 13:33:56.000000000 +0000
+++ chromium-browser-37.0.2062.120/debian/patches/series	2016-02-24 18:38:19.000000000 +0000
@@ -28,3 +28,4 @@
 disable-sse2
 #gyp-icu-m32-test
 #mir-support
+nss-321-fix.patch