diff --git a/opensc.changes b/opensc.changes
index 06fae7d..65ca890 100644
--- a/opensc.changes
+++ b/opensc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 18 13:58:05 UTC 2017 - tchvatal@suse.com
+
+- Switch to tarball fetching from github
+- Few small cleanups
+
 -------------------------------------------------------------------
 Tue Nov 22 16:42:06 CET 2016 - sbrabec@suse.com
 
diff --git a/opensc.spec b/opensc.spec
index da77563..7697c58 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package opensc
 #
-# Copyright (c) 2016 SUSE LINUX 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
@@ -23,7 +23,7 @@ Summary:        Smart Card Utilities
 License:        LGPL-2.1+
 Group:          Productivity/Security
 Url:            https://github.com/OpenSC/OpenSC/wiki
-Source:         %{name}-%{version}.tar.gz
+Source:         https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
 Source2:        %{name}-rpmlintrc
 # Register with p11-kit
@@ -32,14 +32,13 @@ Source3:        opensc.module
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libtool
 BuildRequires:  libxslt
-BuildRequires:  openssl-devel
-BuildRequires:  pcsc-lite-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
+BuildRequires:  pkgconfig(libpcsclite)
+BuildRequires:  pkgconfig(openssl)
 Requires:       pcsc-lite
 # There is no more devel package.
 Obsoletes:      opensc-devel < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 OpenSC provides a set of utilities to access smart cards. It mainly
@@ -60,19 +59,16 @@ may require third party proprietary software.
 %setup -q
 
 %build
-%if 0%{?suse_version} > 1100
-autoreconf -f -i
-%endif
-%configure\
-	--docdir=%{_docdir}/%{name}\
-	--disable-static\
-	--enable-doc
+autoreconf -fvi
+%configure \
+  --docdir=%{_docdir}/%{name} \
+  --disable-static \
+  --enable-doc \
+  --disable-silent-rules
 make %{?_smp_mflags}
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}%{_libdir}/pkcs11
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 cp COPYING NEWS README %{buildroot}%{_docdir}/%{name}
 # Private library.
 rm %{buildroot}%{_libdir}/libopensc.so
@@ -82,7 +78,6 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pkcs11/modules/opensc.mo
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/COPYING
 %doc %{_docdir}/%{name}/NEWS
@@ -95,7 +90,7 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pkcs11/modules/opensc.mo
 %{_libdir}/*.so*
 %dir %{_libdir}/pkcs11
 %{_libdir}/pkcs11/*.so
-%{_mandir}/man?/*.*
+%{_mandir}/man?/*%{ext_man}
 %config %{_sysconfdir}/opensc.conf
 %dir %{_sysconfdir}/pkcs11
 %config %{_sysconfdir}/pkcs11/modules/