diff --git a/libp11-0.3.0.tar.gz b/libp11-0.3.0.tar.gz
deleted file mode 100644
index 6a3a367..0000000
--- a/libp11-0.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:364e1c75dba2741e721cea2ea84fdb297a72b594fe1c11770f323190245a1a75
-size 418457
diff --git a/libp11-0.4.7.tar.gz b/libp11-0.4.7.tar.gz
new file mode 100644
index 0000000..d9d3d99
--- /dev/null
+++ b/libp11-0.4.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32e486d4279e09174b63eb263bc840016ebfa80b0b154390c0539b211aec0452
+size 475538
diff --git a/libp11-0.4.7.tar.gz.asc b/libp11-0.4.7.tar.gz.asc
new file mode 100644
index 0000000..908142a
--- /dev/null
+++ b/libp11-0.4.7.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCAAGBQJZWrNDAAoJEC78f/DUFuAUCEoP/2gzRA5i8twXiTTYK0kAMtgc
+5CArpaxi0oKrVWRcmXC1Bp5fN9PiUMJYj5C9znl7ZBqaA8uGOJwsZdAmEl1Nh5q2
+IlCYNokRZ8MGZOUOOU7kLf8LYVFsoakg9CaNFf00P7a/4McuCxCY3G9bCs1oE092
+stcRdz0v/b7oEFSGaAdgAcD0uFJH+puCFWFrjX41C/WzC44ldaF9dgrG1BfI3W5w
+8cUPd9jbQ22WzjX+f72pysJu3YEnEA/XfLrauC04RoDlnKoceFgIw8mmi6nKa9L/
+Z46bjYi439fSaaKyoJxIcJ9cO08tR6lmy90pUB6+Umn5qRGPq05PHwqQEVEte51l
+j0lDNcqu+CxWy2GFAfOItjgJrCRnWhSMey/3kRGyTqGieehzu4JratHDn34Moz2S
+odtZ9PSrw1PV9Js7/G5H6+XmWw1YSho3Lji2LMN7bez1Flsl9mk44SZTQFR5eppa
+/lKmxdp7yctl1V2FwWFzWUPy8KDAm4NWtmZnE3k87NjTRCYuXAixk4DVTqoc+ssf
+5KL+CpwNOAmnlhbdNcZyjI9ECJGIPi0J4yoqvcdXcei2FWdA2kzPoUPO6+Fu4c/q
+npBjSL7xBW0hpoDUafvTCaB+oPBrZhGBuLVuQJWc52+0xvlQP7PkPBTtC77s0TEz
+hEFM6tKjgiAmChqijVUC
+=lKl2
+-----END PGP SIGNATURE-----
diff --git a/libp11.changes b/libp11.changes
index 4f69d66..d4df57d 100644
--- a/libp11.changes
+++ b/libp11.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Jul 19 12:41:16 UTC 2017 - jengelh@inai.de
+
+- Remove --with-pic which is only for static libs.
+
+-------------------------------------------------------------------
+Mon Jul 17 09:18:06 UTC 2017 - tchvatal@suse.com
+
+- Version update to 0.4.7:
+  * Added OpenSSL-style engine error reporting (Michał Trojnara)
+  * Added the FORCE_LOGIN engine ctrl command (Michał Trojnara)
+  * Implemented the QUIET engine ctrl command (Michał Trojnara)
+  * Modified CKU_CONTEXT_SPECIFIC PIN requests to be based
+    on the CKA_ALWAYS_AUTHENTICATE attribute rather than the
+    CKR_USER_NOT_LOGGED_IN error (Michał Trojnara)
+  * Fixed printing hex values (Michał Trojnara)
+  * Fixed build error with OPENSSL_NO_EC (Kai Kang)
+
+-------------------------------------------------------------------
+Fri Jun 23 14:52:22 UTC 2017 - mpluskal@suse.com
+
+- Update to verion 0.4.6
+  * For full list of changes since version 0.3.0 see NEWS
+- Create openssl-engine-libp11 subpackage
+- Add gpg signature
+
 -------------------------------------------------------------------
 Wed Dec  2 00:18:59 UTC 2015 - p.drouand@gmail.com
 
diff --git a/libp11.keyring b/libp11.keyring
new file mode 100644
index 0000000..ce9addd
--- /dev/null
+++ b/libp11.keyring
@@ -0,0 +1,115 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+UW75VAlQKPWj1Ag5uVpc2ScMEjevQQ==
+=+Od7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/libp11.spec b/libp11.spec
index 16dd138..4a0f16c 100644
--- a/libp11.spec
+++ b/libp11.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libp11
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,23 +16,23 @@
 #
 
 
+%define libname libp11-2
 Name:           libp11
-Version:        0.3.0
+Version:        0.4.7
 Release:        0
-Url:            https://github.com/OpenSC/libp11
 Summary:        Library Implementing a Small Layer on Top of PKCS#11 API
 License:        LGPL-2.1+
 Group:          Productivity/Security
-Source:         https://github.com/OpenSC/libp11/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:        %{name}-rpmlintrc
-Source2:        baselibs.conf
-BuildRequires:  doxygen
+Url:            https://github.com/OpenSC/libp11
+Source0:        https://github.com/OpenSC/libp11/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1:        https://github.com/OpenSC/libp11/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz.asc
+Source2:        %{name}.keyring
+Source3:        %{name}-rpmlintrc
+Source4:        baselibs.conf
 BuildRequires:  fdupes
-BuildRequires:  libtool
-BuildRequires:  openssl-devel
-BuildRequires:  pkg-config
-BuildRequires:  zlib-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(zlib)
 
 %description
 Libp11 is a library implementing a small layer on top of PKCS#11 API to
@@ -45,11 +45,26 @@ Libp11 source code includes the official header files (version 2.20)
 and thus is "derived from the RSA Security Inc. PKCS #11 Cryptographic
 Token Interface (Cryptoki)".
 
-%package -n libp11-2
+%package -n %{libname}
 Summary:        Library Implementing a Small Layer on Top of PKCS#11 API
 Group:          Productivity/Security
 
-%description -n libp11-2
+%description -n %{libname}
+Libp11 is a library implementing a small layer on top of PKCS#11 API to
+make using PKCS#11 implementations easier.
+
+The official name for PKCS#11 is "RSA Security Inc. PKCS #11
+Cryptographic Token Interface (Cryptoki)".
+
+Libp11 source code includes the official header files (version 2.20)
+and thus is "derived from the RSA Security Inc. PKCS #11 Cryptographic
+Token Interface (Cryptoki)".
+
+%package -n openssl-engine-%{name}
+Summary:        Library Implementing a Small Layer on Top of PKCS#11 API
+Group:          Productivity/Security
+
+%description -n openssl-engine-%{name}
 Libp11 is a library implementing a small layer on top of PKCS#11 API to
 make using PKCS#11 implementations easier.
 
@@ -63,7 +78,7 @@ Token Interface (Cryptoki)".
 %package devel
 Summary:        Library Implementing a Small Layer on Top of PKCS#11 API
 Group:          Development/Libraries/C and C++
-Requires:       libp11-2 = %{version}
+Requires:       %{libname} = %{version}
 Requires:       openssl-devel
 
 %description devel
@@ -81,31 +96,34 @@ Token Interface (Cryptoki)".
 %setup -q
 
 %build
-%configure --disable-static --with-pic \
+%configure \
+  --disable-static \
+  --disable-silent-rules \
 	--enable-doc\
-	--docdir=%{_docdir}/libp11-2\
-	--enable-api-doc\
-	--with-apidocdir=%{_docdir}/%{name}-devel
+	--docdir=%{_docdir}/%{libname}
 make %{?_smp_mflags}
 
 %install
-%makeinstall
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/libp11-2
-rm -f %{buildroot}%{_libdir}/*.la
+%make_install
+mkdir -p %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{libname}
+find %{buildroot} -type f -name "*.la" -delete -print
 %fdupes %{buildroot}%{_docdir}
 
-%post -n libp11-2 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%postun -n libp11-2 -p /sbin/ldconfig
-
-%files -n libp11-2
-%defattr (-, root, root)
-%doc %{_docdir}/libp11-2
+%files -n %{libname}
+%doc %{_docdir}/%{libname}
 %{_libdir}/*.so.*
 
+%files -n openssl-engine-%{name}
+%if 0%{?suse_version} > 1325
+%{_libdir}/engines-?.?
+%else
+%{_libdir}/engines
+%endif
+
 %files devel
-%defattr (-, root, root)
-%doc %{_docdir}/%{name}-devel
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc