diff --git a/spec-cleaner-0.5.9.tar.gz b/spec-cleaner-0.5.9.tar.gz
deleted file mode 100644
index c295a61..0000000
--- a/spec-cleaner-0.5.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6013f53139e2f82bf54fc6f4446d16ad379b35f45e6c17c1f1547f4a5c63bb72
-size 56536
diff --git a/spec-cleaner-0.6.1.tar.gz b/spec-cleaner-0.6.1.tar.gz
new file mode 100644
index 0000000..56f6a3e
--- /dev/null
+++ b/spec-cleaner-0.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e1c6fd2e5116eef90bf5a529bab27dde591f2fa601add7af60212ea740519db
+size 60012
diff --git a/spec-cleaner.changes b/spec-cleaner.changes
index a104df9..298408f 100644
--- a/spec-cleaner.changes
+++ b/spec-cleaner.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Aug 29 10:46:17 UTC 2014 - tchvatal@suse.com
+
+- py3 include arpgarse itself.
+
+-------------------------------------------------------------------
+Wed Aug 13 12:28:45 UTC 2014 - tchvatal@suse.com
+
+- Version bump to 0.6.1:
+  * Fixup release with working spec-cleaner script executable
+
+-------------------------------------------------------------------
+Wed Aug 13 12:09:35 UTC 2014 - tchvatal@suse.com
+
+- Version bump to 0.6.0:
+  * Use setuptools and nosetests for building&testing
+  * Various bugfixes as found by java icedtea cleaning
+
 -------------------------------------------------------------------
 Tue Jul  8 11:32:40 UTC 2014 - tchvatal@suse.com
 
diff --git a/spec-cleaner.spec b/spec-cleaner.spec
index a1abe32..2098592 100644
--- a/spec-cleaner.spec
+++ b/spec-cleaner.spec
@@ -18,23 +18,18 @@
 
 
 Name:           spec-cleaner
-Version:        0.5.9
+Version:        0.6.1
 Release:        0
 Summary:        .spec file cleaner
 License:        BSD-3-Clause
 Group:          Development/Tools/Other
 Url:            http://github.com/openSUSE/spec-cleaner
 Source0:        https://github.com/openSUSE/%{name}/archive/%{name}-%{version}.tar.gz
-BuildRequires:  python
-Requires:       python-argparse
+BuildRequires:  python3-mock
+BuildRequires:  python3-nose
+BuildRequires:  python3-setuptools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-# This is just for tests
-# It is conditional so we built on older distros too
-# Drop after 12.2 and older are not targeted here
-%if 0%{?suse_version} > 01220
-BuildRequires:  python3
-%endif
 
 %description
 This script cleans spec file according to some arbitrary style guide. The
@@ -45,15 +40,13 @@ will never be perfect.
 %setup -q -n %{name}-%{name}-%{version}
 
 %build
+python3 setup.py build
 
 %check
-make check -j1
+python3 setup.py test
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags} \
-	LIBEXECDIR=%{_libexecdir} \
-	LIBDIR=%{_libdir} \
-	SITEDIR=%{python_sitelib}
+python3 setup.py install --root="%{buildroot}"
 
 %files
 %defattr(-, root, root)
@@ -62,23 +55,25 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} \
 %dir %{_libexecdir}/obs/service/
 %{_libexecdir}/obs/service/clean_spec_file
 %{_libexecdir}/obs/service/clean_spec_file.service
-%dir %{python_sitelib}/spec_cleaner/
-%{python_sitelib}/spec_cleaner/__init__.py*
-%{python_sitelib}/spec_cleaner/fileutils.py*
-%{python_sitelib}/spec_cleaner/rpmbuild.py*
-%{python_sitelib}/spec_cleaner/rpmcheck.py*
-%{python_sitelib}/spec_cleaner/rpmcleaner.py*
-%{python_sitelib}/spec_cleaner/rpmcopyright.py*
-%{python_sitelib}/spec_cleaner/rpmdescription.py*
-%{python_sitelib}/spec_cleaner/rpmexception.py*
-%{python_sitelib}/spec_cleaner/rpmfiles.py*
-%{python_sitelib}/spec_cleaner/rpminstall.py*
-%{python_sitelib}/spec_cleaner/rpmpreamble.py*
-%{python_sitelib}/spec_cleaner/rpmprep.py*
-%{python_sitelib}/spec_cleaner/rpmprune.py*
-%{python_sitelib}/spec_cleaner/rpmregexp.py*
-%{python_sitelib}/spec_cleaner/rpmscriplets.py*
-%{python_sitelib}/spec_cleaner/rpmsection.py*
+%dir %{python3_sitelib}/spec_cleaner/
+%{python3_sitelib}/spec_cleaner/__init__.py
+%{python3_sitelib}/spec_cleaner/fileutils.py
+%{python3_sitelib}/spec_cleaner/rpmbuild.py
+%{python3_sitelib}/spec_cleaner/rpmcheck.py
+%{python3_sitelib}/spec_cleaner/rpmcleaner.py
+%{python3_sitelib}/spec_cleaner/rpmcopyright.py
+%{python3_sitelib}/spec_cleaner/rpmdescription.py
+%{python3_sitelib}/spec_cleaner/rpmexception.py
+%{python3_sitelib}/spec_cleaner/rpmfiles.py
+%{python3_sitelib}/spec_cleaner/rpminstall.py
+%{python3_sitelib}/spec_cleaner/rpmpreamble.py
+%{python3_sitelib}/spec_cleaner/rpmprep.py
+%{python3_sitelib}/spec_cleaner/rpmprune.py
+%{python3_sitelib}/spec_cleaner/rpmregexp.py
+%{python3_sitelib}/spec_cleaner/rpmscriplets.py
+%{python3_sitelib}/spec_cleaner/rpmsection.py
+%{python3_sitelib}/spec_cleaner/__pycache__
+%{python3_sitelib}/spec_cleaner-%{version}-py%{py3_ver}.egg-info
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/excludes-bracketing.txt
 %{_datadir}/%{name}/licenses_changes.txt