diff --git a/libedit.changes b/libedit.changes
index 5cce068..e241f9d 100644
--- a/libedit.changes
+++ b/libedit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 22 11:45:10 UTC 2015 - tchvatal@suse.com
+
+- Cleanup a bit with spec-cleaner
+  * remove pkg_name variable which is equal to name variable
+
 -------------------------------------------------------------------
 Fri Jun 19 12:01:55 UTC 2015 - idonmez@suse.com
 
diff --git a/libedit.spec b/libedit.spec
index 3c3ef51..4e2c933 100644
--- a/libedit.spec
+++ b/libedit.spec
@@ -16,19 +16,15 @@
 #
 
 
+%define pkg_version 20150325-3.1
+%define soname 0
+%define library_name libedit%{soname}
 Name:           libedit
 Version:        3.1.snap20150325
 Release:        0
-%define pkg_name    libedit
-%define pkg_version 20150325-3.1
-#
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  ncurses-devel
-BuildRequires:  pkgconfig
-#
+Summary:        Command Line Editing and History Library
+License:        BSD-3-Clause
+Group:          Development/Libraries/C and C++
 Url:            http://www.thrysoee.dk/editline/
 Source:         http://thrysoee.dk/editline/libedit-%{pkg_version}.tar.gz
 Source1:        README.SUSE
@@ -36,23 +32,22 @@ Source2:        baselibs.conf
 Patch2:         libedit-20100424-3.0-ncurses.patch
 Patch3:         libedit-ocloexec.patch
 Patch4:         libedit-visibility.patch
-Summary:        Command Line Editing and History Library
-License:        BSD-3-Clause
-Group:          Development/Libraries/C and C++
+BuildRequires:  gcc-c++
+BuildRequires:  libtool
+BuildRequires:  ncurses-devel
+BuildRequires:  pkgconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libedit is a command line editing and history library. It is designed
 to be used by interactive programs that allow the user to type commands
 at a terminal prompt.
 
-%define library_name libedit0
-%define soname 0
-
 %package -n %{library_name}
-Provides:       %{pkg_name} = %{version}-%{release}
-Obsoletes:      %{pkg_name} < %{version}
 Summary:        Command Line Editing and History Library
 Group:          Development/Libraries/C and C++
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}
 
 %description -n %{library_name}
 libedit is a command line editing and history library. It is designed
@@ -60,11 +55,11 @@ to be used by interactive programs that allow the user to type commands
 at a terminal prompt.
 
 %package -n libedit-devel
-Requires:       %{library_name} = %{version}
-Provides:       %{library_name}-devel = %{version}-%{release}
-Requires:       glibc-devel
 Summary:        Development files for libedit
 Group:          Development/Libraries/C and C++
+Requires:       %{library_name} = %{version}
+Requires:       glibc-devel
+Provides:       %{library_name}-devel = %{version}-%{release}
 
 %description -n libedit-devel
 libedit is a command line editing and history library. It is designed
@@ -74,27 +69,27 @@ at a terminal prompt.
 This package holds the development files for libedit.
 
 %prep
-%setup -q -n %{pkg_name}-%{pkg_version}
-cp %{S:1} .
+%setup -q -n %{name}-%{pkg_version}
+cp %{SOURCE1} .
 %patch2
 %patch3
 %patch4 -p1
 
 %build
-NOCONFIGURE=1 autoreconf -fiv
-%configure --disable-static \
-           --with-pic \
-           --disable-silent-rules \
-           --enable-widec
-
+autoreconf -fiv
+%configure \
+    --disable-static \
+    --with-pic \
+    --disable-silent-rules \
+    --enable-widec
 make %{?_smp_mflags}
 
 %install
-%makeinstall
-rm "%{buildroot}%{_libdir}"/*.la
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-make check
+make %{?_smp_mflags} check
 
 %post   -n %{library_name} -p /sbin/ldconfig