diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 9c7d31d..73a0fd3 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Apr 24 05:58:54 UTC 2018 - wr@rosenauer.org
+
+- update to NSS 3.36.1
+  Notable changes
+  * In NSS version 3.35 the iteration count in optimized builds,
+    which is used for password based encryption algorithm related to
+    encrypted PKCS#7 or PKCS#12 data, was increased to one million
+    iterations. That change had caused an interoperability regression
+    with operating systems that are limited to 600 K iterations.
+    NSS 3.36.1 has been changed to use the same 600 K limit.
+  Bugs fixed
+  * Certain smartcard operations could result in a deadlock.
+
 -------------------------------------------------------------------
 Thu Mar 15 18:13:38 UTC 2018 - cgrobertson@suse.com
 
@@ -5,7 +19,7 @@ Thu Mar 15 18:13:38 UTC 2018 - cgrobertson@suse.com
   New functionality
   * Experimental APIs for TLS session cache handling
   Notable Changes
-  * Replaces existing vectorized ChaCha20 code with verified 
+  * Replaces existing vectorized ChaCha20 code with verified
     HACL* implementation.
 - Removed patch as no longer needed: renegotiate-transitional.patch
   upstream fix
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index beb7e3a..035b3b6 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -25,7 +25,7 @@ BuildRequires:  mozilla-nspr-devel >= 4.19
 BuildRequires:  pkg-config
 BuildRequires:  sqlite-devel
 BuildRequires:  zlib-devel
-Version:        3.36
+Version:        3.36.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_36_RTM/src/nss-%{version}.tar.gz
-# hg clone https://hg.mozilla.org/projects/nss nss-3.36/nss ; cd nss-3.36/nss ; hg up NSS_3_36_RTM
+Source:         https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_36_1_RTM/src/nss-%{version}.tar.gz
+# hg clone https://hg.mozilla.org/projects/nss nss-3.36.1/nss ; cd nss-3.36.1/nss ; hg up NSS_3_36_1_RTM
 #Source:         nss-%{version}.tar.gz
 Source1:        nss.pc.in
 Source3:        nss-config.in
diff --git a/nss-3.36.1.tar.gz b/nss-3.36.1.tar.gz
new file mode 100644
index 0000000..0c521c1
--- /dev/null
+++ b/nss-3.36.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff
+size 23026430
diff --git a/nss-3.36.tar.gz b/nss-3.36.tar.gz
deleted file mode 100644
index fc63381..0000000
--- a/nss-3.36.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a33cc7b8299b5ce3acf03f617c7896932ae26927ff9fb7c71c1b69a200c30095
-size 23025578