diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..7cee2ed
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,3 @@
+coolkey
+    +/usr/lib(64)?/pkcs11/*.so
+    requires "coolkey = <version>"
diff --git a/coolkey.changes b/coolkey.changes
index 6b396a5..255f82b 100644
--- a/coolkey.changes
+++ b/coolkey.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 22 16:01:46 CET 2016 - sbrabec@suse.com
+
+- Create baselibs.conf.
+- Add PKCS11 module to p11-kit-32bit (bsc#996047#c39).
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:51 UTC 2011 - coolo@suse.com
 
diff --git a/coolkey.spec b/coolkey.spec
index e16ae5a..f649625 100644
--- a/coolkey.spec
+++ b/coolkey.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package coolkey
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,16 @@
 #
 
 
-
 Name:           coolkey
 Version:        1.1.0
-Release:        132
+Release:        0
 Summary:        CoolKey and CAC PKCS #11 PKI Module for Smart Cards
 License:        LGPL-2.1
 Group:          Productivity/Security
 Url:            http://directory.fedoraproject.org/wiki/CoolKey
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
+Source2:        baselibs.conf
 # Patches imported from Fedora:
 # PATCH-FIX-FEDORA coolkey-gcc43.patch bnc661643 sbrabec@suse.cz -- Fix for gcc-4.3.
 Patch2:         coolkey-gcc43.patch
@@ -49,8 +49,12 @@ Patch54:        coolkey-cache-dir-move.patch
 # PATCH-FIX-UPSTREAM coolkey-null.patch redhat356971 sbrabec@suse.cz -- Fix invalid NULL declaration.
 Patch55:        coolkey-null.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  gcc-c++ mozilla-nss-devel pcsc-lite-devel pkg-config zlib-devel
+BuildRequires:  gcc-c++
 BuildRequires:  libtool
+BuildRequires:  mozilla-nss-devel
+BuildRequires:  pcsc-lite-devel
+BuildRequires:  pkg-config
+BuildRequires:  zlib-devel
 #Requires:       pcsc-lite
 # Requires: ifd-egate
 Requires:       pcsc-ccid
@@ -77,7 +81,6 @@ cards, which are available in both smart card and USB Fob form factors.
 
 
 %package devel
-License:        LGPL-2.1
 Summary:        CoolKey and CAC PKCS #11 PKI Module for Smart Cards
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}