diff --git a/librubberband.changes b/librubberband.changes
index 8a2d49f..9cb95c3 100644
--- a/librubberband.changes
+++ b/librubberband.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 16 15:34:47 UTC 2015 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner
+- Remove conditional for < 11.4
+- Add baselibs.conf to spec as source
+
 -------------------------------------------------------------------
 Thu Feb 12 21:43:16 UTC 2015 - p.drouand@gmail.com
 
diff --git a/librubberband.spec b/librubberband.spec
index 7487e19..2298fa7 100644
--- a/librubberband.spec
+++ b/librubberband.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package librubberband
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -16,41 +16,43 @@
 #
 
 
+%define library_name librubberband2
 Name:           librubberband
 Version:        1.8.1
-Release:        1
+Release:        0
 Summary:        Audio time-stretching and pitch-shifting library
-Group:          System/Libraries
 License:        GPL-2.0+
+Group:          System/Libraries
 Url:            http://www.breakfastquay.com/rubberband/
 Source:         http://code.breakfastquay.com/attachments/download/34/rubberband-%{version}.tar.bz2
+Source1:        baselibs.conf
 Patch1:         rubberband-mk.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  fftw3-devel gcc-c++ libsamplerate-devel pkg-config
-BuildRequires:  ladspa-devel libsndfile-devel vamp-plugin-sdk-devel
-BuildRequires:  dos2unix help2man
+BuildRequires:  dos2unix
+BuildRequires:  fftw3-devel
+BuildRequires:  gcc-c++
+BuildRequires:  help2man
+BuildRequires:  ladspa-devel
+BuildRequires:  libsamplerate-devel
+BuildRequires:  libsndfile-devel
+BuildRequires:  pkg-config
+BuildRequires:  vamp-plugin-sdk-devel
 Requires:       ladspa
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Rubber Band is a library and utility program that permits you to change the
 tempo and pitch of an audio recording independently of one another.
 
-
-%define library_name librubberband2
-
-%package -n     librubberband2
+%package -n     %{library_name}
 Summary:        Audio time-stretching and pitch-shifting library
 Group:          System/Libraries
-License:        GPL-2.0+
 Url:            http://www.breakfastquay.com/rubberband/
 
-%description -n librubberband2
+%description -n %{library_name}
 Rubber Band is a library and utility program that permits you to change the
 tempo and pitch of an audio recording independently of one another.
 
-
 %package -n     rubberband-cli
-License:        GPL-2.0+
 Summary:        Command line interface for %{name}
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 Requires:       %{library_name} = %{version}
@@ -59,9 +61,7 @@ Requires:       %{library_name} = %{version}
 Package rubberband-cli contains a command-line utility that can be used to exploit
 Rubber Band's capabilities.
 
-
 %package -n     rubberband-ladspa
-License:        GPL-2.0+
 Summary:        LADSPA plugin for %{name}
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 Requires:       %{library_name} = %{version}
@@ -70,7 +70,6 @@ Requires:       %{library_name} = %{version}
 Package rubberband-ladspa is LADSPA plugin that can change the pitch of a sound in real-time.
 
 %package -n     rubberband-vamp
-License:        GPL-2.0+
 Summary:        Vamp plugins for %{name}
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 Requires:       %{library_name} = %{version}
@@ -92,9 +91,7 @@ This package contains the following Vamp plugins:
  * timesyncpoints (Time Sync Points): Salient points which stretcher
    aims to place with strictly correct timing
 
-
 %package        devel
-License:        GPL-2.0+
 Summary:        Development files for %{name}
 Group:          Development/Libraries/C and C++
 Requires:       %{library_name} = %{version}
@@ -104,7 +101,6 @@ Requires:       pkgconfig
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-
 %prep
 %setup -q -n rubberband-%{version}
 %patch1
@@ -114,14 +110,12 @@ mv README.txt README
 
 %build
 %configure
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+rm %{buildroot}%{_libdir}/*.a
 
-# Generate man page with help2man
-# 11.3 help2man hasn't --no-discard-stderr
-%if 0%{?suse_version} >= 1140
 mkdir -p %{buildroot}%{_mandir}/man1
 pushd %{buildroot}%{_mandir}/man1
 cp -v %{buildroot}%{_bindir}/rubberband ./
@@ -129,16 +123,14 @@ help2man --no-discard-stderr \
 	-N -o rubberband.1 ./rubberband
 rm rubberband
 popd
-%endif
 
 %post -n %{library_name} -p /sbin/ldconfig
 
 %postun -n %{library_name} -p /sbin/ldconfig
 
-%files -n librubberband2
+%files -n %{library_name}
 %defattr(-,root,root,-)
 %doc README COPYING
-%exclude %{_libdir}/librubberband.a
 %{_libdir}/*.so.*
 
 %files devel
@@ -151,9 +143,7 @@ popd
 %files -n rubberband-cli
 %defattr(-,root,root,-)
 %{_bindir}/rubberband
-%if 0%{?suse_version} >= 1140
 %{_mandir}/man1/rubberband.1.gz
-%endif
 
 %files -n rubberband-ladspa
 %defattr(-,root,root,-)