diff --git a/18.1.0.tar.gz b/18.1.0.tar.gz
new file mode 100644
index 0000000..7fbe6a8
--- /dev/null
+++ b/18.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24a1257641041cb1e75a50c343ecc42e4e0fb9aeb1215ae7e42dea1f9356041f
+size 34251
diff --git a/python-service_identity.changes b/python-service_identity.changes
index afe73c9..bab5f6a 100644
--- a/python-service_identity.changes
+++ b/python-service_identity.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Fri Mar  1 14:02:29 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- update to 18.1.0
+- drop fetch-intersphinx-inventories.sh
+- drop local-intersphinx-inventories.patch
+- cleanup spec + enable tests
+ * pyOpenSSL is optional now if you use service_identity.cryptography.* only.
+ * Added support for iPAddress subjectAltNames.
+
+-------------------------------------------------------------------
+Mon Feb 25 19:48:17 UTC 2019 - Todd R <toddrme2178@gmail.com>
+
+- add fetch-intersphinx-inventories.sh to the sources
+
+-------------------------------------------------------------------
+Mon Feb  4 19:49:08 UTC 2019 - Hans-Peter Jansen <hpj@urpla.net>
+
+- add local-intersphinx-inventories.patch for generating the docs
+  correctly
+- add fetch-intersphinx-inventories.sh to fetch the inventories
+
 -------------------------------------------------------------------
 Tue Dec  4 12:54:12 UTC 2018 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-service_identity.spec b/python-service_identity.spec
index 646495b..4b52776 100644
--- a/python-service_identity.spec
+++ b/python-service_identity.spec
@@ -1,8 +1,7 @@
 #
 # spec file for package python-service_identity
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2014 LISA GmbH, Bingen, Germany.
+# Copyright (c) 2019 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
@@ -20,28 +19,34 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define oname   service_identity
 Name:           python-service_identity
-Version:        17.0.0
+Version:        18.1.0
 Release:        0
 Summary:        Service identity verification for pyOpenSSL
 License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/pyca/service_identity
-Source0:        https://pypi.io/packages/source/s/%{oname}/%{oname}-%{version}.tar.gz
-# Documentation
-BuildRequires:  %{python_module Sphinx}
+# no tests in upstream tarball
+Source:         https://github.com/pyca/service_identity/archive/%{version}.tar.gz
 BuildRequires:  %{python_module attrs}
+BuildRequires:  %{python_module cryptography}
+BuildRequires:  %{python_module idna}
 BuildRequires:  %{python_module pyOpenSSL >= 0.14}
 BuildRequires:  %{python_module pyasn1-modules}
 BuildRequires:  %{python_module pyasn1}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-attrs
-Requires:       python-pyOpenSSL >= 0.14
+Requires:       python-cryptography
 Requires:       python-pyasn1
 Requires:       python-pyasn1-modules
-Requires:       python-setuptools
+Recommends:     python-idna
+Recommends:     python-pyOpenSSL
 BuildArch:      noarch
+%ifpython2
+Requires:       python-ipaddress
+%endif
 %python_subpackages
 
 %description
@@ -58,26 +63,16 @@ relevant RFCs too.
 %build
 %python_build
 
-# make man and documentation
-cd docs
-# do not run these in parallel to ensure reproducible builds (boo#1102408)
-make %{?_smp_mflags} man
-make %{?_smp_mflags} singlehtml
-
 %install
 %python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-# install man
-install -Dm 0644 docs/_build/man/%{oname}.1 %{buildroot}%{_mandir}/man1/%{oname}.1
-%python_clone %{buildroot}%{_mandir}/man1/%{oname}.1
-
-%python_expand %fdupes %{buildroot}%{$python_sitelib}/%{oname}
+%check
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v
 
 %files %{python_files}
 %license LICENSE
-%doc AUTHORS.rst README.rst docs/_build/singlehtml/index.html
-%{_mandir}/man1/*-%{python_bin_suffix}.1%{?ext_man}
-%python3_only %{_mandir}/man1/%{oname}.1%{?ext_man}
+%doc AUTHORS.rst README.rst
 %{python_sitelib}/%{oname}
 %{python_sitelib}/%{oname}-%{version}-py%{py_ver}.egg-info
 
diff --git a/service_identity-17.0.0.tar.gz b/service_identity-17.0.0.tar.gz
deleted file mode 100644
index 9a8ef2f..0000000
--- a/service_identity-17.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab
-size 23502