diff --git a/ipset.changes b/ipset.changes
index fbf4f13..41b6d0f 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -2,7 +2,6 @@
 Fri Sep 15 16:44:31 UTC 2017 - kstreitova@suse.com
 
 - fix build for Factory
-- run spec-cleaner 
 
 -------------------------------------------------------------------
 Fri Mar 17 11:45:35 UTC 2017 - jengelh@inai.de
diff --git a/ipset.spec b/ipset.spec
index 71fc042..2b41d65 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -33,8 +33,8 @@ Group:          Productivity/Networking/Security
 Url:            http://ipset.netfilter.org/
 #Git-Clone:	git://git.netfilter.org/ipset
 #Git-Web:	http://git.netfilter.org/
-Source:         http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
-Source3:        %{name}-preamble
+Source:         http://ipset.netfilter.org/%name-%version.tar.bz2
+Source3:        %name-preamble
 Patch1:         ipset-destdir.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -43,9 +43,9 @@ BuildRequires:  linux-glibc-devel >= 2.6.24
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  pkgconfig(libmnl) >= 1
 %if 0%{?ipset_build_kmp}
-BuildRequires:  %{kernel_module_package_buildreqs}
+BuildRequires:  %kernel_module_package_buildreqs
 BuildRequires:  kernel-syms >= 2.6.39
-%kernel_module_package -p %{name}-preamble
+%kernel_module_package -p %name-preamble
 %if 0%{?suse_version} >= 1320
 BuildRequires:  kmod-compat
 %endif
@@ -79,11 +79,11 @@ when matching an entry against a set.
 
 This package contains a version update to the in-kernel ipset modules.
 
-%package -n %{lname}
+%package -n %lname
 Summary:        Userspace library for the in-kernel Netfilter ipset interface
 Group:          System/Libraries
 
-%description -n %{lname}
+%description -n %lname
 IP sets are a framework inside the Linux kernel, which can be
 administered by the ipset utility. Depending on the type, currently
 an IP set may store IP addresses, (TCP/UDP) port numbers or IP
@@ -93,7 +93,7 @@ when matching an entry against a set.
 %package devel
 Summary:        Development files for ipset extensions
 Group:          Development/Libraries/C and C++
-Requires:       %{lname} = %{version}
+Requires:       %lname = %version
 
 %description devel
 IP sets are a framework inside the Linux kernel, which can be
@@ -108,52 +108,52 @@ when matching an entry against a set.
 
 %build
 # build wants to call modinfo at some point
-export PATH="$PATH:%{_prefix}/sbin"
+export PATH="$PATH:%_prefix/sbin"
 autoreconf -fi
 %if 0%{?ipset_build_kmp}
-for flavor in %{flavors_to_build}; do
-	cp -a . "../%{name}-$flavor-%{version}"
-	pushd "../%{name}-$flavor-%{version}/"
+for flavor in %flavors_to_build; do
+	cp -a . "../%name-$flavor-%version"
+	pushd "../%name-$flavor-%version/"
 	# ksource: it just checks for a header
 	%configure --disable-static \
-		--with-kbuild="%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor" \
-		--with-ksource="%{_prefix}/src/linux" \
-		--includedir="%{_includedir}/%{name}"
+		--with-kbuild="%_prefix/src/linux-obj/%_target_cpu/$flavor" \
+		--with-ksource="%_prefix/src/linux" \
+		--includedir="%_includedir/%name"
 	make %{?_smp_mflags} all modules
 	popd
 done
 %endif
 %configure --disable-static --with-kmod=no \
-	--includedir="%{_includedir}/%{name}"
+	--includedir="%_includedir/%name"
 make %{?_smp_mflags}
 
 %install
-export PATH="$PATH:%{_prefix}/sbin"
-b=%{buildroot}
+export PATH="$PATH:%_prefix/sbin"
+b=%buildroot
 %if 0%{?ipset_build_kmp}
-for flavor in %{flavors_to_build}; do
-	pushd "../%{name}-$flavor-%{version}/"
+for flavor in %flavors_to_build; do
+	pushd "../%name-$flavor-%version/"
 	make %{?_smp_mflags} install modules_install \
 		DESTDIR="$b" INSTALL_MOD_PATH="$b" V=1
 	popd;
 done;
 %endif
 make %{?_smp_mflags} install DESTDIR="$b"
-find %{buildroot} -type f -name "*.la" -delete -print
+find %buildroot -type f -name "*.la" -delete -print
 
-%post   -n %{lname} -p /sbin/ldconfig
-%postun -n %{lname} -p /sbin/ldconfig
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
 %files
-%{_sbindir}/ipset
-%{_mandir}/man*/*
+%_sbindir/ipset
+%_mandir/man*/*
 
-%files -n %{lname}
-%{_libdir}/libipset.so.3*
+%files -n %lname
+%_libdir/libipset.so.3*
 
 %files devel
-%{_libdir}/libipset.so
-%{_libdir}/pkgconfig/libipset.pc
-%{_includedir}/%{name}/
+%_libdir/libipset.so
+%_libdir/pkgconfig/libipset.pc
+%_includedir/%name/
 
 %changelog