diff --git a/3.0.0.tar.gz b/tinyxml2-3.0.0.tar.gz
similarity index 100%
rename from 3.0.0.tar.gz
rename to tinyxml2-3.0.0.tar.gz
diff --git a/tinyxml2.changes b/tinyxml2.changes
index 07cc89c..332a0ed 100644
--- a/tinyxml2.changes
+++ b/tinyxml2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jul 12 07:50:05 UTC 2016 - mpluskal@suse.com
+
+- Cleanup spec file
+  * run spec-cleaner
+  * drop not needed dependencies (libtool and doxygen)
+  * execute tests during build
+  * use pretty name for tarball
+
 -------------------------------------------------------------------
 Tue Apr  7 12:04:37 UTC 2015 - jengelh@inai.de
 
diff --git a/tinyxml2.spec b/tinyxml2.spec
index 928e4ea..8f37aff 100644
--- a/tinyxml2.spec
+++ b/tinyxml2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tinyxml2
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,22 +17,19 @@
 
 
 %define so_version 3
-
+%define lib_package lib%{name}-%{so_version}
 Name:           tinyxml2
 Version:        3.0.0
 Release:        0
-%define lib_package lib%{name}-%{so_version}
 Summary:        A simple, small, C++ XML parser
 License:        Zlib
 Group:          Development/Libraries/C and C++
-Source:         https://github.com/leethomason/tinyxml2/archive/%{version}.tar.gz
 Url:            https://github.com/leethomason/tinyxml2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source:         https://github.com/leethomason/tinyxml2/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  cmake
-BuildRequires:  doxygen
 BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 TinyXML is a simple, small, C++ XML parser that can be easily integrating
@@ -71,23 +68,24 @@ developing applications that use libtinyxml2.
 make %{?_smp_mflags}
 
 %install
-cd build
-%make_install
-rm -f %{buildroot}%{_libdir}/*.la
+%cmake_install
+find %{buildroot} -type f -name "*.la" -delete -print
+
+%check
+make %{?_smp_mflags} test
 
 %post -n %{lib_package} -p /sbin/ldconfig
-
 %postun -n %{lib_package} -p /sbin/ldconfig
 
 %files -n %{lib_package}
 %defattr(-,root,root)
-%doc  readme.md
-%{_libdir}/*.so.*
+%doc readme.md
+%{_libdir}/libtinyxml2.so.%{so_version}*
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*
+%{_includedir}/tinyxml2.h
+%{_libdir}/libtinyxml2.so
 %{_libdir}/pkgconfig/tinyxml2.pc
-%{_libdir}/*.so
 
 %changelog