diff --git a/1.6.0.tar.gz b/1.6.0.tar.gz
deleted file mode 100644
index 14d5ac9..0000000
--- a/1.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4678d9e51a8b29c6a0a510fee78c865639e9ee2b7feddda853f70e95e92e191
-size 985552
diff --git a/tpm2-pkcs11-1.6.0.tar.gz b/tpm2-pkcs11-1.6.0.tar.gz
new file mode 100644
index 0000000..476a9cc
--- /dev/null
+++ b/tpm2-pkcs11-1.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61e2849c07acb4acbf756bdd6a9fe44f9475343256fa0bdc966b77321169c125
+size 1370370
diff --git a/tpm2-pkcs11.changes b/tpm2-pkcs11.changes
index 33bd1b4..a11961a 100644
--- a/tpm2-pkcs11.changes
+++ b/tpm2-pkcs11.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Aug 20 17:59:05 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Clean spec file
+- Use better source URL
+- Split library
+- Don't package .la files
+- Create store directory
+- Move devel library to devel subpackage
+
 -------------------------------------------------------------------
 Wed Sep  9 10:05:02 UTC 2020 - Alexander Evseev <aevseev@gmail.com> - 1.4.0
 
diff --git a/tpm2-pkcs11.spec b/tpm2-pkcs11.spec
index 2cb185e..2756b09 100644
--- a/tpm2-pkcs11.spec
+++ b/tpm2-pkcs11.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tpm2
+# spec file for package tpm2-pkcs11
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -15,22 +15,21 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%define so_ver   0
 
+%define so_ver  0
 Name:           tpm2-pkcs11
 Version:        1.6.0
 Release:        0
-URL:            https://github.com/tpm2-software/tpm2-pkcs11
 Summary:        A PKCS#11 interface for TPM2 hardware
 License:        BSD-2-Clause
 Group:          Productivity/Security
-
-# Build-time parameters
+URL:            https://github.com/tpm2-software/tpm2-pkcs11
+Source0:        %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  autoconf
 BuildRequires:  autoconf-archive >= 2017.03.21
 BuildRequires:  automake
 BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  tpm2.0-tools
 BuildRequires:  pkgconfig(libcrypto) >= 1.0.2g
 BuildRequires:  pkgconfig(p11-kit-1)
@@ -40,63 +39,64 @@ BuildRequires:  pkgconfig(tss2-mu)
 BuildRequires:  pkgconfig(tss2-rc)
 BuildRequires:  pkgconfig(tss2-tctildr)
 BuildRequires:  pkgconfig(yaml-0.1)
-Source:         https://github.com/tpm2-software/tpm2-pkcs11/archive/refs/tags/%{version}.tar.gz
 
 %description
 PKCS #11 is a Public-Key Cryptography Standard that defines a standard method to
-access cryptographic services from tokens/ devices such as hardware security
+access cryptographic services from tokens/devices such as hardware security
 modules (HSM), smart cards, etc. In this project we intend to use a TPM2 device
 as the cryptographic token.
 
-%package -n libtpm2_pkcs110
+%package -n libtpm2_pkcs11-0
 Summary:        A PKCS#11 interface for TPM2 hardware
+Group:          System/Libraries
+Requires:       %{name} = %{version}
 
-%description -n libtpm2_pkcs110
+%description -n libtpm2_pkcs11-0
 PKCS #11 is a Public-Key Cryptography Standard that defines a standard method to
-access cryptographic services from tokens/ devices such as hardware security
+access cryptographic services from tokens/devices such as hardware security
 modules (HSM), smart cards, etc. In this project we intend to use a TPM2 device
 as the cryptographic token.
 
-
 %package devel
-Summary:        Developent files for %{name}
-Group:          Development/Languages/C and C++
-
-Requires:       libtpm2_pkcs110 = %{version}
+Summary:        Development files for %{name}
+Group:          Development/Libraries/C and C++
+Requires:       libtpm2_pkcs11-0 = %{version}
 Provides:       libtpm2_pkcs11-devel = %{version}-%{release}
 
 %description devel
-Headers and linraries to build software against %{name}.
+Headers and libraries to build software against %{name}.
 
 %prep
-%setup -q
-if [ ! -x configure ]; then
-    test -x bootstrap && ./bootstrap || autoreconf --install
-fi
+%autosetup
 
 %build
-%{configure} --disable-static
-%{__make} %{?_smp_mflags}
+autoreconf -fiv
+%configure --disable-static
+%make_build
 
 %install
-%{__make} install DESTDIR=%{buildroot}
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
+mkdir -p %{buildroot}%{_sysconfdir}/tpm2_pkcs11
 
-%files -n libtpm2_pkcs110
-%defattr(-,root,root)
-%doc CHANGELOG.md LICENSE docs/*
-%dir %{_libdir}/pkcs11
-%{_libdir}/pkcs11/libtpm2_pkcs11.so
-%{_libdir}/pkcs11/libtpm2_pkcs11.so.%{?so_ver}*
+%post -n libtpm2_pkcs11-0 -p /sbin/ldconfig
+%postun -n libtpm2_pkcs11-0 -p /sbin/ldconfig
+
+%files
+%license LICENSE
+%doc CHANGELOG.md docs/*
 %dir %{_datadir}/p11-kit/modules
 %dir %{_datadir}/p11-kit
 %{_datadir}/p11-kit/modules/tpm2_pkcs11.module
+%{_sysconfdir}/tpm2_pkcs11
+
+%files -n libtpm2_pkcs11-0
+%dir %{_libdir}/pkcs11
+%{_libdir}/pkcs11/libtpm2_pkcs11.so.%{so_ver}*
 
 %files devel
-%defattr(-,root,root)
+%dir %{_libdir}/pkcs11
 %{_libdir}/pkgconfig/tpm2-pkcs11.pc
-%exclude %{_libdir}/pkcs11/libtpm2_pkcs11.la
-
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%{_libdir}/pkcs11/libtpm2_pkcs11.so
 
 %changelog