diff --git a/shunit2.changes b/shunit2.changes
index 487b438..62b49ca 100644
--- a/shunit2.changes
+++ b/shunit2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 20 15:29:17 UTC 2016 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Update project url
+
 -------------------------------------------------------------------
 Wed Apr 20 13:34:37 UTC 2016 - carlospecter@gmail.com
 
diff --git a/shunit2.spec b/shunit2.spec
index 40316d3..166d515 100644
--- a/shunit2.spec
+++ b/shunit2.spec
@@ -16,23 +16,21 @@
 #
 
 
-%define SHUNIT_HOME  /usr/share/shunit2
-
+%define SHUNIT_HOME  %{_datadir}/shunit2
 Name:           shunit2
+Version:        2.1.6
+Release:        0
 Summary:        Test Framework for Bourne Based Shell Scripts
 License:        LGPL-2.1
 Group:          Development/Languages/Other
-Version:        2.1.6
-Release:        0
+Url:            https://github.com/kward/shunit2 
 Source0:        %{name}-%{version}.tgz
 Source1:        lgpl-2.1.txt
 Patch0:         %{name}-gen_test_results.sh.diff
 Patch1:         %{name}-examples.diff
+BuildRequires:  bash
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-# Vendor:
-Url:            http://code.google.com/p/shunit2
-BuildRequires:  bash
 
 %description
 shUnit2 is a xUnit unit test framework for Bourne based shell scripts,
@@ -40,11 +38,10 @@ and it is designed to work in a similar manner to JUnit, PyUnit, etc.
 If you have ever had the desire to write a unit test for a shell
 script, shUnit2 can do the job.
 
-
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 # Use the correct version and overwrite it:
-cp %{S:1} doc/LGPL-2.1
+cp %{SOURCE1} doc/LGPL-2.1
 
 %patch0
 %patch1
@@ -57,10 +54,10 @@ for i in examples/*.sh; do
 done
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{SHUNIT_HOME}
+mkdir -p %{buildroot}%{_bindir} %{buildroot}%{SHUNIT_HOME}
 
-install -m 755 src/shunit2 $RPM_BUILD_ROOT%{_bindir}
-cp -a lib src  $RPM_BUILD_ROOT%{SHUNIT_HOME}
+install -m 755 src/shunit2 %{buildroot}%{_bindir}
+cp -a lib src  %{buildroot}%{SHUNIT_HOME}
 
 %files
 %defattr(-,root,root)