diff --git a/laszip-src-2.2.0.tar.bz2.md5 b/laszip-src-2.2.0.tar.bz2.md5
deleted file mode 100644
index d41c4f8..0000000
--- a/laszip-src-2.2.0.tar.bz2.md5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (laszip-src-2.2.0.tar.bz2) = 93194700623f6aca470454299361e89d
diff --git a/laszip.changes b/laszip.changes
index 90aa196..fd9ad18 100644
--- a/laszip.changes
+++ b/laszip.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Feb 12 20:37:23 UTC 2015 - mpluskal@suse.com
+
+- Cleanup specfile:
+  * remove dependency on make
+  * remove dependency on own lib (at it is generated automatically)
+  * do not use excessive %defines as this is not necessary
+  * move test to separate package
+  * remove %check section as it is not checking anything, just 
+    building test.
+- Use autoreconf to prevent random build failures
+
 -------------------------------------------------------------------
 Fri Aug 22 14:29:18 UTC 2014 - bruno@ioda-net.ch
 
diff --git a/laszip.spec b/laszip.spec
index 0ce0204..7cab61f 100644
--- a/laszip.spec
+++ b/laszip.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package LASzip
+# spec file for package laszip
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot)
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,11 +17,6 @@
 #
 
 
-%define soname 6
-%define sovers 6.0.0
-%define _libname liblaszip
-%define _shlibname %{_libname}%{soname}
-# Not used upstream has no idea about multiversion
 Name:           laszip
 Version:        2.2.0
 Release:        0
@@ -29,18 +24,14 @@ Summary:        Compression library supporting ASPRS LAS format data
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Url:            http://www.laszip.org/
-Source:         https://github.com/LASzip/LASzip/releases/download/v%{version}/laszip-src-%{version}.tar.bz2
-Source1:        https://github.com/LASzip/LASzip/releases/download/v%{version}/laszip-src-%{version}.tar.bz2.md5
+Source0:        https://github.com/LASzip/LASzip/releases/download/v%{version}/laszip-src-%{version}.tar.bz2
 #Upstream issue pull request Update COPYING #10 on 2014-08-21
 Source2:        lgpl-2.1.txt
-#Patch:
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
-BuildRequires:  make
-Requires:       %{_shlibname} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -52,13 +43,26 @@ to allow other softwares that handle LAS data to read and write LASzip-compresse
 data. The BSD-licensed libLAS and the LGPL-licensed LASlib can take advantage of
 LASzip to read and write compressed data.
 
-This package contain only the laszippertest tool
-
-%package -n %{_shlibname}
-Summary:        Library files for %{name}
+%package test
+Summary:	Test for %{name}
 Group:          Development/Libraries/C and C++
 
-%description -n %{_shlibname}
+%description test
+A free product of rapidlasso GmbH - quickly turns bulky LAS files into
+compact LAZ files without information loss. LASzip is a compression library that
+was developed by Martin Isenburg for compressing ASPRS LAS format data in his
+LAStools. It has been provided as an LGPL-licensed stand-alone software library
+to allow other softwares that handle LAS data to read and write LASzip-compressed
+data. The BSD-licensed libLAS and the LGPL-licensed LASlib can take advantage of
+LASzip to read and write compressed data.
+
+This package contain only the laszippertest tool
+
+%package -n lib%{name}6
+Summary:        Library files for %{name}
+Group:          System/Libraries
+
+%description -n lib%{name}6
 A free product of rapidlasso GmbH - quickly turns bulky LAS files into
 compact LAZ files without information loss. LASzip is a compression library that
 was developed by Martin Isenburg for compressing ASPRS LAS format data in his
@@ -72,7 +76,7 @@ This package contain only the dynamic build.
 %package devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries/C and C++
-Requires:       %{_shlibname} = %{version}
+Requires:       lib%{name}6 = %{version}
 Requires:       gcc-c++
 
 %description devel
@@ -83,10 +87,11 @@ data.
 %prep
 %setup -q -n laszip-src-%{version}
 sed -i 's/-O3 -DNDEBUG//g' ./configure
-#sed -i 's/-O3 -DNDEBUG//g' ./configure.ac
+sed -i 's/-O3 -DNDEBUG//g' ./configure.ac
 cp -f %{SOURCE2} COPYING
 
 %build
+autoreconf -fi
 %configure
 
 # Make things more secure, but only on new version
@@ -97,19 +102,18 @@ export CXXFLAGS="%{optflags} -fPIE -pie"
 %endif
 
 make %{?_smp_mflags}
+make %{?_smp_mflags} check
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 #Cleanup No .a in package
-find %{buildroot} -iname *%{_libname}*.a -exec rm -fv {} \;
+rm -f %{buildroot}%{_libdir}/lib%{name}.a
+rm -f %{buildroot}%{_libdir}/lib%{name}.la
 
-%check
-make check %{?_smp_mflags}
+%post -n lib%{name}6 -p /sbin/ldconfig
 
-%post -n %{_shlibname} -p /sbin/ldconfig
-
-%postun -n %{_shlibname}  -p /sbin/ldconfig
+%postun -n lib%{name}6  -p /sbin/ldconfig
 
 %files devel
 %defattr(-,root,root)
@@ -118,18 +122,16 @@ make check %{?_smp_mflags}
 %{_includedir}/laszip.hpp
 %{_includedir}/laszipexport.hpp
 %{_includedir}/laszipper.hpp
-%{_libdir}/%{_libname}.so
-%{_libdir}/%{_libname}.la
+%{_libdir}/lib%{name}.so
 
-%files
+%files test
 %defattr(-,root,root)
 %doc ChangeLog AUTHORS COPYING
 %{_bindir}/laszippertest
 
-%files -n %{_shlibname}
+%files -n lib%{name}6
 %defattr(-,root,root)
 %doc ChangeLog AUTHORS COPYING
-%{_libdir}/%{_libname}.so.%{soname}
-%{_libdir}/%{_libname}.so.%{sovers}
+%{_libdir}/lib%{name}.so.*
 
 %changelog