diff --git a/.gitignore b/.gitignore
index b4c98b1..5ad5838 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /softhsm-2.0.0rc1.tar.gz.sig
 /softhsm-2.0.0.tar.gz
 /softhsm-2.0.0.tar.gz.sig
+/softhsm-2.1.0.tar.gz
diff --git a/softhsm.spec b/softhsm.spec
index b519930..34fa4f3 100644
--- a/softhsm.spec
+++ b/softhsm.spec
@@ -2,8 +2,8 @@
 
 Summary: Software version of a PKCS#11 Hardware Security Module
 Name: softhsm
-Version: 2.0.0
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}
+Version: 2.1.0
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz
@@ -12,8 +12,6 @@ Source2: softhsm.module
 # taken from coolkey which is not build on all arches we build on
 Source3: softhsm2-pk11install.c
 
-Patch1: softhsm-2.0.0-1272453-Issue162.patch
-
 Group: Applications/System
 BuildRequires: openssl-devel >= 1.0.1k-6, sqlite-devel >= 3.4.2, cppunit-devel
 BuildRequires: gcc-c++, pkgconfig, p11-kit-devel, nss-devel
@@ -47,8 +45,6 @@ The devel package contains the libsofthsm include files
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
-%patch1 -p1
-
 %if 0%{?prever:1}
 autoreconf -fiv
 %endif
@@ -89,12 +85,15 @@ install -m0755 -D softhsm2-pk11install %{buildroot}/%{_bindir}/softhsm2-pk11inst
 # opendnssec have that filename in their configuration file.
 mkdir -p %{buildroot}/%{_libdir}/softhsm/
 ln -s ../pkcs11/libsofthsm2.so %{buildroot}/%{_libdir}/softhsm/libsofthsm.so
+# rhbz#1272423 NSS needs it to be in the search path too
+( cd  %{buildroot}/%{_libdir} ; ln -s pkcs11/libsofthsm2.so)
 
 %files
 %config(noreplace) %{_sysconfdir}/softhsm2.conf
 %{_bindir}/*
 %dir %{_libdir}/softhsm
 %{_libdir}/pkcs11/libsofthsm2.so
+%{_libdir}/libsofthsm2.so
 %{_libdir}/softhsm/libsofthsm.so
 %attr(0664,root,root) %{_datadir}/p11-kit/modules/softhsm.module
 %attr(0770,ods,ods) %dir %{_sharedstatedir}/softhsm
@@ -129,6 +128,11 @@ if [ -f /var/softhsm/slot0.db ]; then
 fi
 
 %changelog
+* Mon May 16 2016 Paul Wouters <pwouters@redhat.com> - 2.1.0-1
+- Resolves: rhbz#1244461 Updated to 2.1.0
+- Resolves: rhbz#1272423 Softhsm PKCS#11 module not visible to NSS becasue it is not in the search path
+- Removed merged in bug#162 patch
+
 * Thu Feb 25 2016 Paul Wouters <pwouters@redhat.com> - 2.0.0-2
 - Resolves: rhbz#1272453 A marked as CA certificate cannot be written in a softhsmv2 db
 
diff --git a/sources b/sources
index 48a5681..bb0335a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-843044f01cdac1362f49795691d35e48  softhsm-2.0.0.tar.gz.sig
-d72a3ad65229af3e43570f8be1a0703e  softhsm-2.0.0.tar.gz
+4dc6ffa59c22e500e0fd16d9c00e814c  softhsm-2.1.0.tar.gz