diff --git a/ell.changes b/ell.changes
index 3bc00a7..e25fbea 100644
--- a/ell.changes
+++ b/ell.changes
@@ -7,7 +7,6 @@ Thu Apr  4 17:17:50 UTC 2019 - Alexei Sorokin <sor.alexei@meowr.ru>
   * Add support for the TLS version range configuration.
   * Add support for time utility functions.
 - Remove unsigned-char.patch: fixed upstream.
-- Spec clean-up.
 
 -------------------------------------------------------------------
 Fri Mar 15 09:29:34 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
diff --git a/ell.spec b/ell.spec
index 8a235b7..e1ff63d 100644
--- a/ell.spec
+++ b/ell.spec
@@ -16,8 +16,8 @@
 #
 
 
-%define sover   0
 Name:           ell
+%define lname   libell0
 Version:        0.18
 Release:        0
 Summary:        Wireless setup and cryptography library
@@ -25,30 +25,30 @@ License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://01.org/ell
 #Git-URL:       https://git.kernel.org/pub/scm/libs/ell/ell.git/
-Source:         https://mirrors.kernel.org/pub/linux/libs/ell/%{name}-%{version}.tar.xz
-Source2:        https://mirrors.kernel.org/pub/linux/libs/ell/%{name}-%{version}.tar.sign
-Source3:        %{name}.keyring
+Source:         https://mirrors.kernel.org/pub/linux/libs/ell/%name-%version.tar.xz
+Source2:        https://mirrors.kernel.org/pub/linux/libs/ell/%name-%version.tar.sign
+Source3:        %name.keyring
 BuildRequires:  gcc-c++
 BuildRequires:  libtool >= 2.2
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
 BuildRequires:  xz
 
 %description
 The "Embedded Linux Library" implements an API for wireless
 cryptography actions by using the kernel crypto API.
 
-%package -n lib%{name}%{sover}
+%package -n %lname
 Summary:        Wireless setup and cryptography library
 Group:          System/Libraries
 
-%description -n lib%{name}%{sover}
+%description -n %lname
 The "Embedded Linux Library" implements an API for wireless
 cryptography actions by using the kernel crypto API.
 
 %package devel
 Summary:        Development files for the ELL wireless setup/crypto library
 Group:          Development/Libraries/C and C++
-Requires:       lib%{name}%{sover} = %{version}
+Requires:       %lname = %version
 
 %description devel
 The "Embedded Linux Library" implements an API for wireless
@@ -58,7 +58,7 @@ This subpackage contains libraries and header files for developing
 applications that want to make use of ell.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure
@@ -66,22 +66,21 @@ make %{?_smp_mflags} V=1
 
 %install
 %make_install
-find %{buildroot} -type f -name "*.la" -delete -print
+rm -f "%buildroot/%_libdir"/*.la
 
 %check
 make %{?_smp_mflags} V=1 check || :
 
-%post -n lib%{name}%{sover} -p /sbin/ldconfig
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
-%postun -n lib%{name}%{sover} -p /sbin/ldconfig
-
-%files -n lib%{name}%{sover}
+%files -n %lname
 %license COPYING
-%{_libdir}/lib%{name}.so.%{sover}*
+%_libdir/libell.so.*
 
 %files devel
-%{_libdir}/lib%{name}.so
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/%{name}/
+%_libdir/libell.so
+%_libdir/pkgconfig/*.pc
+%_includedir/ell/
 
 %changelog