diff --git a/python-terminado.changes b/python-terminado.changes
index 57ea24d..14491f0 100644
--- a/python-terminado.changes
+++ b/python-terminado.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Apr 24 20:55:54 UTC 2017 - toddrme2178@gmail.com
+
+- Fix URL.
+- Implement single-spec version.
+
+-------------------------------------------------------------------
+Sat Apr  8 19:21:31 UTC 2017 - toddrme2178@gmail.com
+
+- Update to 0.6
+  (no upstream changelog)
+
 -------------------------------------------------------------------
 Fri Aug 14 09:39:09 UTC 2015 - toddrme2178@gmail.com
 
diff --git a/python-terminado.spec b/python-terminado.spec
index 701d7c9..3cb5b6f 100644
--- a/python-terminado.spec
+++ b/python-terminado.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-terminado
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,26 +16,31 @@
 #
 
 
+%bcond_without tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-terminado
-Version:        0.5
+Version:        0.6
 Release:        0
 Summary:        Terminals served to termjs using Tornado websockets
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
 Url:            https://github.com/takluyver/terminado
-Source:         https://pypi.python.org/packages/source/t/terminado/terminado-%{version}.tar.gz
-BuildRequires:  python-devel >= 2.7
-BuildRequires:  python-nose
-BuildRequires:  python-ptyprocess
-BuildRequires:  python-tornado
+Source:         https://files.pythonhosted.org/packages/source/t/terminado/terminado-%{version}.tar.gz
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module ptyprocess}
+BuildRequires:  %{python_module tornado}
+%if %{with tests}
+BuildRequires:  %{python_module nose}
+%endif
 Requires:       python-ptyprocess
 Requires:       python-tornado
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
 BuildArch:      noarch
-%endif
+%python_subpackages
 
 %description
 This is a Tornado websocket backend for the term.js Javascript terminal
@@ -49,15 +54,18 @@ of QWeb).
 %setup -q -n terminado-%{version}
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%if %{with tests}
 %check
-nosetests
+%python_expand nosetests-%{$python_bin_suffix}
+%endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc README.rst
 %{python_sitelib}/*
diff --git a/terminado-0.5.tar.gz b/terminado-0.5.tar.gz
deleted file mode 100644
index 67357d4..0000000
--- a/terminado-0.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63e893eff1ba84f1ee7c4bfcca7676ba1de6394538bb9aa80cbbc8866cb875b6
-size 10491
diff --git a/terminado-0.6.tar.gz b/terminado-0.6.tar.gz
new file mode 100644
index 0000000..5914870
--- /dev/null
+++ b/terminado-0.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c0ba1f624067dccaaead7d2247cfe029806355cef124dc2ccb53c83229f0126
+size 10334