diff --git a/bug-lp-1265482.diff b/bug-lp-1265482.diff
deleted file mode 100644
index 629c8e7..0000000
--- a/bug-lp-1265482.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: OpenSSL/test/test_crypto.py
-===================================================================
---- OpenSSL/tests/test_crypto.py.orig
-+++ OpenSSL/tests/test_crypto.py
-@@ -627,7 +627,7 @@
-         `PKey.generate_key` generates an RSA key when passed `TYPE_RSA` as a
-         type and a reasonable number of bits.
-         """
--        bits = 128
-+        bits = 2048
-         key = PKey()
-         key.generate_key(TYPE_RSA, bits)
-         assert key.type() == TYPE_RSA
diff --git a/pyOpenSSL-17.5.0.tar.gz b/pyOpenSSL-17.5.0.tar.gz
deleted file mode 100644
index 344f7ac..0000000
--- a/pyOpenSSL-17.5.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773
-size 170870
diff --git a/pyOpenSSL-18.0.0.tar.gz b/pyOpenSSL-18.0.0.tar.gz
new file mode 100644
index 0000000..a59479b
--- /dev/null
+++ b/pyOpenSSL-18.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580
+size 167296
diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes
index 42e317e..4dd053f 100644
--- a/python-pyOpenSSL.changes
+++ b/python-pyOpenSSL.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 16 15:48:21 UTC 2018 - tchvatal@suse.com
+
+- Update to 18.0.0:
+  * Update for new openssl 1.1.1
+- Remove not needed patches:
+  * bug-lp-1265482.diff
+  * rsa128-i586.patch
+
 -------------------------------------------------------------------
 Tue Feb 27 19:20:19 UTC 2018 - aplanas@suse.com
 
diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec
index 6d7108a..6c82dc1 100644
--- a/python-pyOpenSSL.spec
+++ b/python-pyOpenSSL.spec
@@ -19,27 +19,23 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define oldpython python
 Name:           python-pyOpenSSL
-Version:        17.5.0
+Version:        18.0.0
 Release:        0
 Summary:        Python wrapper module around the OpenSSL library
 License:        Apache-2.0
 Group:          Development/Languages/Python
-Url:            https://github.com/pyca/pyopenssl
+URL:            https://github.com/pyca/pyopenssl
 Source:         https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz
-Patch0:         bug-lp-1265482.diff
 Patch1:         skip-networked-test.patch
-Patch2:         rsa128-i586.patch
-BuildRequires:  %{python_module cryptography >= 2.1.4}
-BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module cryptography >= 2.2.1}
 BuildRequires:  %{python_module flaky}
 BuildRequires:  %{python_module pretend}
 BuildRequires:  %{python_module pytest >= 3.0.1}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
-BuildRequires:  openssl-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-Sphinx
-Requires:       python-cryptography >= 2.1.4
+Requires:       python-cryptography >= 2.2.1
 Requires:       python-six >= 1.5.2
 Provides:       pyOpenSSL = %{version}
 BuildArch:      noarch
@@ -67,9 +63,7 @@ Provides documentation for %{name}.
 
 %prep
 %setup -q -n pyOpenSSL-%{version}
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %python_build
@@ -77,7 +71,7 @@ Provides documentation for %{name}.
 %install
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
-PYTHONPATH="%{buildroot}%{python3_sitelib}" %__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
+PYTHONPATH="%{buildroot}%{python3_sitelib}" python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
 
 %check
 export LC_ALL=en_US.UTF-8
@@ -86,7 +80,8 @@ py.test-%{$python_bin_suffix} -m "not network" -k "not test_export_text"
 }
 
 %files %{python_files}
-%doc LICENSE *.rst
+%license LICENSE
+%doc *.rst
 %{python_sitelib}/OpenSSL/
 %{python_sitelib}/pyOpenSSL-%{version}-py*.egg-info
 
diff --git a/rsa128-i586.patch b/rsa128-i586.patch
deleted file mode 100644
index 3b3821f..0000000
--- a/rsa128-i586.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: pyOpenSSL-17.0.0/tests/test_ssl.py
-===================================================================
---- pyOpenSSL-17.0.0.orig/tests/test_ssl.py
-+++ pyOpenSSL-17.0.0/tests/test_ssl.py
-@@ -525,7 +525,7 @@
-         `Context.use_privatekey` takes an `OpenSSL.crypto.PKey` instance.
-         """
-         key = PKey()
--        key.generate_key(TYPE_RSA, 128)
-+        key.generate_key(TYPE_RSA, 2048)
-         ctx = Context(TLSv1_METHOD)
-         ctx.use_privatekey(key)
-         with pytest.raises(TypeError):
-@@ -546,7 +546,7 @@
-         arguments does not raise an exception.
-         """
-         key = PKey()
--        key.generate_key(TYPE_RSA, 128)
-+        key.generate_key(TYPE_RSA, 2048)
- 
-         with open(pemfile, "wt") as pem:
-             pem.write(
-@@ -849,7 +849,7 @@
-         passphrase.  Return the path to the new file.
-         """
-         key = PKey()
--        key.generate_key(TYPE_RSA, 128)
-+        key.generate_key(TYPE_RSA, 2048)
-         pem = dump_privatekey(FILETYPE_PEM, key, "blowfish", passphrase)
-         with open(tmpfile, 'w') as fObj:
-             fObj.write(pem.decode('ascii'))