diff --git a/python-waitress.changes b/python-waitress.changes
index 5528aa1..b8fafef 100644
--- a/python-waitress.changes
+++ b/python-waitress.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon May  1 16:38:04 UTC 2017 - toddrme2178@gmail.com
+
+- Update to 1.0.2
+  * Python 3.6 is now officially supported in Waitress
+  * Add a work-around for libc issue on Linux not following the
+    documented standards. If getnameinfo() fails because of DNS not
+    being available it should return the IP address instead of the
+    reverse DNS entry, however instead getnameinfo() raises. We
+    catch this, and ask getnameinfo() for the same information
+    again, explicitly asking for IP address instead of reverse
+    DNS hostname.
+- Implement single-spec version.
+- Fix source URL.
+
 -------------------------------------------------------------------
 Tue Nov 15 14:49:27 UTC 2016 - tbechtold@suse.com
 
diff --git a/python-waitress.spec b/python-waitress.spec
index 7565249..c858b18 100644
--- a/python-waitress.spec
+++ b/python-waitress.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-waitress
 #
-# Copyright (c) 2016 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,27 +16,29 @@
 #
 
 
+# Tests require a network connection
+%bcond_with tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-waitress
-Version:        1.0.1
+Version:        1.0.2
 Release:        0
 Summary:        Waitress WSGI server
 License:        ZPL-2.1
 Group:          Development/Languages/Python
 Url:            https://github.com/Pylons/waitress
-Source:         https://pypi.io/packages/source/w/waitress/waitress-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+Source:         https://files.pythonhosted.org/packages/source/w/waitress/waitress-%{version}.tar.gz
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+%if %{with tests}
 # Test requirements:
-BuildRequires:  python-nose
-# Documentation requirements:
-#BuildRequires:  python-Sphinx
-#BuildRequires:  python-docutils
-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
+BuildRequires:  %{python_module nose}
 %endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
+%python_subpackages
 
 %description
 Waitress is meant to be a production-quality pure-Python WSGI server with very
@@ -52,19 +54,21 @@ http://docs.pylonsproject.org/projects/waitress/en/latest/ .
 %setup -q -n waitress-%{version}
 
 %build
-python setup.py build
-#python setup.py build_sphinx
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-## %check
-## python setup.py test
+%if %{with tests}
+%check
+%python_exec setup.py test
+%endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc COPYRIGHT.txt LICENSE.txt README.rst
-%{_bindir}/waitress-serve
+%python3_only %{_bindir}/waitress-serve
 %{python_sitelib}/*
 
 %changelog
diff --git a/waitress-1.0.1.tar.gz b/waitress-1.0.1.tar.gz
deleted file mode 100644
index 1ea31a4..0000000
--- a/waitress-1.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2daacaece189ede6a23440afe03bda58089a6207f1d80a1e9497f979dfb741fc
-size 123934
diff --git a/waitress-1.0.2.tar.gz b/waitress-1.0.2.tar.gz
new file mode 100644
index 0000000..4222d46
--- /dev/null
+++ b/waitress-1.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c74fa1b92cb183d5a3684210b1bf0a0845fe8eb378fa816f17199111bbf7865f
+size 124685