diff --git a/PyVirtualDisplay-0.1.5.tar.gz b/PyVirtualDisplay-0.1.5.tar.gz
deleted file mode 100644
index 3ffaf22..0000000
--- a/PyVirtualDisplay-0.1.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53
-size 18272
diff --git a/PyVirtualDisplay-0.2.1.tar.gz b/PyVirtualDisplay-0.2.1.tar.gz
new file mode 100644
index 0000000..bdac991
--- /dev/null
+++ b/PyVirtualDisplay-0.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982
+size 30785
diff --git a/python-PyVirtualDisplay.changes b/python-PyVirtualDisplay.changes
index 1c86ffc..6a57805 100644
--- a/python-PyVirtualDisplay.changes
+++ b/python-PyVirtualDisplay.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug 28 19:33:27 UTC 2017 - toddrme2178@gmail.com
+
+- update to version 0.2.1:
+  * no changelog available
+- Implement single-spec version
+- Fix source URL
+
 -------------------------------------------------------------------
 Tue May 12 12:55:54 UTC 2015 - benoit.monin@gmx.fr
 
diff --git a/python-PyVirtualDisplay.spec b/python-PyVirtualDisplay.spec
index 6568b13..2c526ab 100644
--- a/python-PyVirtualDisplay.spec
+++ b/python-PyVirtualDisplay.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-PyVirtualDisplay
 #
-# 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,37 +16,57 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without test
 Name:           python-PyVirtualDisplay
-Version:        0.1.5
+Version:        0.2.1
 Release:        0
 Url:            https://github.com/ponty/PyVirtualDisplay
 Summary:        Python wrapper for Xvfb, Xephyr and Xvnc
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Source:         http://pypi.python.org/packages/source/P/PyVirtualDisplay/PyVirtualDisplay-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-Requires:       xorg-x11-Xvnc
-%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
+Source:         https://files.pythonhosted.org/packages/source/P/PyVirtualDisplay/PyVirtualDisplay-%{version}.tar.gz
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-2to3
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+%if %{with test}
+BuildRequires:  %{python_module EasyProcess}
+BuildRequires:  %{python_module nose}
 %endif
+Requires:       python-EasyProcess
+Requires:       xorg-x11-Xvfb
+Recommends:     xorg-x11-Xvnc
+Suggests:       xorg-x11-server-extra
+BuildArch:      noarch
+
+%python_subpackages
 
 %description
-pyvirtualdisplay is a python wrapper for Xvfb, Xephyr and Xvnc
+PyVirtualDisplay is a python wrapper for Xvfb, Xephyr and Xvnc
 
 %prep
 %setup -q -n PyVirtualDisplay-%{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}
 
-%files
+%if %{with test}
+%check
+mkdir tester
+pushd tester
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
+$python -B -m nose pyvirtualdisplay
+}
+popd
+%endif
+
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc README.rst LICENSE.txt
 %{python_sitelib}/*