diff --git a/shunit2.changes b/shunit2.changes
index abc1e41..62b49ca 100644
--- a/shunit2.changes
+++ b/shunit2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+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
+
+- spec update: installed shunit2 binary to bindir
+
 -------------------------------------------------------------------
 Thu May 23 09:41:50 UTC 2013 - cfarrell@suse.com
 
@@ -8,4 +19,3 @@ Thu May 23 09:41:50 UTC 2013 - cfarrell@suse.com
 Thu Feb  2 08:35:14 UTC 2012 - toms@opensuse.org
 
 - First initial release 2.1.6
-
diff --git a/shunit2.spec b/shunit2.spec
index d078af8..166d515 100644
--- a/shunit2.spec
+++ b/shunit2.spec
@@ -1,43 +1,47 @@
 #
 # spec file for package shunit2
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define SHUNIT_HOME  /usr/share/shunit2
-
-Name:     shunit2
-Summary:  Test Framework for Bourne Based Shell Scripts
-Version:  2.1.6
-Release:  0
-Source0:  %{name}-%{version}.tgz
-Source1:  lgpl-2.1.txt
-Patch0:   %{name}-gen_test_results.sh.diff
-Patch1:   %{name}-examples.diff
-License:  LGPL-2.1
-Group:    Development/Languages/Other
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-# Vendor:  
-URL:      http://code.google.com/p/shunit2
-BuildRequires: bash
 
+%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
+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
 
 %description
-shUnit2 is a xUnit unit test framework for Bourne based shell scripts, 
-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. 
-
+shUnit2 is a xUnit unit test framework for Bourne based shell scripts,
+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
@@ -49,16 +53,13 @@ for i in examples/*.sh; do
   sed -i 's#@SHUNIT_HOME@#%{SHUNIT_HOME}#g' $i
 done
 
-
 %install
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{SHUNIT_HOME}
+mkdir -p %{buildroot}%{_bindir} %{buildroot}%{SHUNIT_HOME}
 
-install -m 755 bin/gen_test_results.sh $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 
+%files
 %defattr(-,root,root)
 %doc doc/* examples
 %{_bindir}/*
@@ -68,5 +69,4 @@ cp -a lib src  $RPM_BUILD_ROOT%{SHUNIT_HOME}
 %{SHUNIT_HOME}/src/*
 %{SHUNIT_HOME}/lib/*
 
-
 %changelog