diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 728f0b9..6d65b8c 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 12 08:56:48 UTC 2017 - wr@rosenauer.org
+
+- update to NSS 3.31.1
+  * Potential deadlock when using an external PKCS#11 token (bmo#1381784)
+
 -------------------------------------------------------------------
 Sat Aug  5 13:15:09 UTC 2017 - wr@rosenauer.org
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 5872939..975e280 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -21,11 +21,11 @@
 
 Name:           mozilla-nss
 BuildRequires:  gcc-c++
-BuildRequires:  mozilla-nspr-devel >= 4.14
+BuildRequires:  mozilla-nspr-devel >= 4.15
 BuildRequires:  pkg-config
 BuildRequires:  sqlite-devel
 BuildRequires:  zlib-devel
-Version:        3.31
+Version:        3.31.1
 Release:        0
 # bug437293
 %ifarch ppc64
@@ -36,8 +36,8 @@ Summary:        Network Security Services
 License:        MPL-2.0
 Group:          System/Libraries
 Url:            http://www.mozilla.org/projects/security/pki/nss/
-Source:         https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_31_RTM/src/nss-%{version}.tar.gz
-# hg clone https://hg.mozilla.org/projects/nss nss-3.31/nss ; cd nss-3.31/nss ; hg up NSS_3_31_RTM
+Source:         https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_31_1_RTM/src/nss-%{version}.tar.gz
+# hg clone https://hg.mozilla.org/projects/nss nss-3.31.1/nss ; cd nss-3.31.1/nss ; hg up NSS_3_31_1_RTM
 #Source:         nss-%{version}.tar.gz
 Source1:        nss.pc.in
 Source3:        nss-config.in
diff --git a/nss-3.31.1.tar.gz b/nss-3.31.1.tar.gz
new file mode 100644
index 0000000..808a145
--- /dev/null
+++ b/nss-3.31.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:933439214dc03ee60e86d1419c19e1568998b0776dde987f41fa70ced6cd08dc
+size 9537705
diff --git a/nss-3.31.tar.gz b/nss-3.31.tar.gz
deleted file mode 100644
index 19450ae..0000000
--- a/nss-3.31.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d
-size 9537011