diff --git a/Automat-0.4.0.tar.gz b/Automat-0.4.0.tar.gz
deleted file mode 100644
index eda58d5..0000000
--- a/Automat-0.4.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24b97bc7e77804875da59383cccc7013bbec00296edf9baa7e2b5a969ed09df7
-size 25791
diff --git a/Automat-0.6.0.tar.gz b/Automat-0.6.0.tar.gz
new file mode 100644
index 0000000..c11be50
--- /dev/null
+++ b/Automat-0.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8
+size 31767
diff --git a/python-Automat.changes b/python-Automat.changes
index 2933cbb..6184da2 100644
--- a/python-Automat.changes
+++ b/python-Automat.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Jul  4 04:45:19 UTC 2017 - tbechtold@suse.com
+
+update to version v0.6.0
+  * use version-specific travis environments
+  * tox/travis: enable tests on py3.5
+  * add a comment: this check doesn't catch non-None returns
+  * improve function-is-empty test to work on py3.6 too
+  * add more metadata to setup
+  * graphviz() -> asDigraph()
+  * Use inspect.getfullargspec on Py3 to avoid deprecation warnings with inspect.getargspec
+  * add tracing API, with docs
+  * Conform author metadata to `distutils.core` API
+  * tracer can return a callable to see Output invocations
+  * Make hashable classes frozen for attrs 17.1.0 (fixes #62).
+  * Assert that 'input' function bodies are empty, to avoid surprises.
+  * reject duplicate transitions (same starting state and input)
+  * tox/travis: enable tests on py3.6
+  * improve tests: more cases, make pyflakes-clean
+  * sigh, add more code to attain full test coverage
+  * make setTrace a private API, document cautions about its use
+  * cover the specimen functions in tests, remove ordify()
+  * cleanup: s/assert_no_code/assertNoCode/
+- convert to singlespec
+- fix Source url
+
 -------------------------------------------------------------------
 Tue Jan 24 23:48:39 UTC 2017 - termim@gmail.com
 
diff --git a/python-Automat.spec b/python-Automat.spec
index 5e8ad90..57956e1 100644
--- a/python-Automat.spec
+++ b/python-Automat.spec
@@ -13,21 +13,27 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-Automat
-Version:        0.4.0
+Version:        0.6.0
 Release:        0
-License:        MIT
 Summary:        Self-service finite-state machines for the programmer on the go
-Url:            https://github.com/glyph/automat
+License:        MIT
 Group:          Development/Languages/Python
-Source:         https://pypi.org/packages/source/A/Automat/Automat-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-BuildRequires:  python-setuptools_scm
-BuildRequires:  python-attrs
-BuildRequires:  python-six
+Url:            https://github.com/glyph/automat
+Source:         https://files.pythonhosted.org/packages/source/A/Automat/Automat-%{version}.tar.gz
+BuildRequires:  %{python_module Twisted}
+BuildRequires:  %{python_module attrs}
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module m2r}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools_scm}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six}
+BuildRequires:  python-rpm-macros
 Requires:       python-attrs
 Requires:       python-six
 Suggests:       python-graphviz > 0.5.1
@@ -37,45 +43,35 @@ Requires(preun): update-alternatives
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
+%python_subpackages
+
 %description
 Automat is a library for concise, idiomatic Python expression of finite-state
 automata (particularly deterministic finite-state transducers).
 
-
-
 %prep
 %setup -q -n Automat-%{version}
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_clone -a %{buildroot}%{_bindir}/automat-visualize
+
 %check
-python setup.py test
-
-# Prepare for update-alternatives usage
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-
-mv %{buildroot}%{_bindir}/automat-visualize %{buildroot}%{_bindir}/automat-visualize-%{py_ver}
-ln -s -f %{_sysconfdir}/alternatives/automat-visualize %{buildroot}%{_bindir}/automat-visualize
-# create a dummy target for /etc/alternatives/automat-visualize
-touch %{buildroot}%{_sysconfdir}/alternatives/automat-visualize
+%python_exec setup.py test
 
 %post
-%_sbindir/update-alternatives \
-    --install %{_bindir}/automat-visualize automat-visualize %{_bindir}/automat-visualize-%{py_ver} 30
+%python_install_alternative automat-visualize
 
-%preun
-if [ $1 -eq 0 ] ; then
-    %_sbindir/update-alternatives --remove automat-visualize %{_bindir}/automat-visualize-%{py_ver}
-fi
+%postun
+%python_uninstall_alternative automat-visualize
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc LICENSE README.md
-%{_bindir}/automat-visualize
-%{_bindir}/automat-visualize-%{py_ver}
-%ghost %{_sysconfdir}/alternatives/automat-visualize
+%python_alternative %{_bindir}/automat-visualize
 %{python_sitelib}/*
 
+%changelog