diff --git a/001-fix-buffering-for-python38.patch b/001-fix-buffering-for-python38.patch
deleted file mode 100644
index 91a0b41..0000000
--- a/001-fix-buffering-for-python38.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/M2Crypto/SSL/Connection.py b/M2Crypto/SSL/Connection.py
-index 7053aa6..6503935 100644
---- a/M2Crypto/SSL/Connection.py
-+++ b/M2Crypto/SSL/Connection.py
-@@ -12,6 +12,7 @@ Copyright 2008 Heikki Toivonen. All rights reserved.
- 
- import logging
- import socket
-+import io
- 
- from M2Crypto import BIO, Err, X509, m2, py27plus, six, util  # noqa
- from M2Crypto.SSL import Checker, Context, timeout  # noqa
-@@ -584,7 +585,10 @@ class Connection(object):
-     def makefile(self, mode='rb', bufsize=-1):
-         # type: (AnyStr, int) -> socket._fileobject
-         if six.PY3:
--            return socket.SocketIO(self, mode)
-+            raw = socket.SocketIO(self, mode)
-+            if 'rw' in mode:
-+                return io.BufferedRWPair(raw, raw)
-+            return io.BufferedReader(raw, io.DEFAULT_BUFFER_SIZE)
-         else:
-             return socket._fileobject(self, mode, bufsize)
- 
diff --git a/M2Crypto-0.35.2.tar.gz b/M2Crypto-0.35.2.tar.gz
deleted file mode 100644
index 50de91e..0000000
--- a/M2Crypto-0.35.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c6ad45ffb88670c590233683074f2440d96aaccb05b831371869fc387cbd127
-size 1117706
diff --git a/M2Crypto-0.36.0.tar.gz b/M2Crypto-0.36.0.tar.gz
new file mode 100644
index 0000000..309c742
--- /dev/null
+++ b/M2Crypto-0.36.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1542c18e3ee5c01db5031d0b594677536963e3f54ecdf5315aeecb3a595b4dc1
+size 1127584
diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes
index c1ad24e..2990409 100644
--- a/python-M2Crypto.changes
+++ b/python-M2Crypto.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Mon Jul 13 21:07:34 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+Update to 0.36.0:
+    - wrap SocketIO in io.Buffered* for makefile <lethliel>
+    - SSL.Connection.close accepts an argument to force the socket closing
+      <Christophe Haen>
+    - SSL.Connection: make the clientPostConnectionCheck an instance
+      attribute <Christophe Haen>
+    - Fixed bug with usage of unexisting method getreply at SSL_Transport
+      <roman-nagaev>
+    - Add appveyor builds for python 3.7 and 3.8 <Daniel A. Wozniak>
+    - Fixed syntax warning on line 44. <randomfox>
+    - Update M2Crypto.six to 1.13.0 <Matěj Cepl>
+    - base64.decodestring() was finally removed in Python 3.8. <Matěj Cepl>
+    - wrap SocketIO in io.Buffered* for makefile <lethliel>
+    - NULL is legal argument for key and iv paramters of EVP_CipherInit(3)
+      <Matěj Cepl>
+    - Expose X509_V_FLAG_ALLOW_PROXY_CERTS verification flag and
+      X509_STORE_SET_FLAGS function <Christophe Haen>
+    - Stop testing for 2.6 and 3.4 on Travis. Start testing 3.8 <Matěj Cepl>
+    - Extend test cert validity to 2049 <Bernhard M. Wiedemann>
+    - Revert using typing module in 2.6. It is just not worthy. <Matěj Cepl>
+    - Update Debian/stable SSL as well <Matěj Cepl>
+    - Make tests pass again. <Matěj Cepl>
+    - Stop using string module, which has been deprecated. <Matěj Cepl>
+    - Tiny fixes to make pyls more happy <Matěj Cepl>
+    - CI: Rework Fedora CI configuration <Neal Gompa> 
+- Remove upstream merged patch 001-fix-buffering-for-python38.patch.
+
 -------------------------------------------------------------------
 Wed Apr  8 12:30:32 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec
index 095ab1c..0c9f452 100644
--- a/python-M2Crypto.spec
+++ b/python-M2Crypto.spec
@@ -19,14 +19,13 @@
 %define oldpython python
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-M2Crypto
-Version:        0.35.2
+Version:        0.36.0
 Release:        0
 Summary:        Crypto and SSL toolkit for Python
 License:        MIT
 Group:          Development/Languages/Python
 URL:            https://gitlab.com/m2crypto/m2crypto
 Source:         https://files.pythonhosted.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
-Patch1:         001-fix-buffering-for-python38.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module typing}
@@ -78,9 +77,6 @@ Documentation for the Crypto and SSL toolkit for Python
 
 %prep
 %setup -q -n M2Crypto-%{version}
-%if 0%{?suse_version} > 1500
-%patch1 -p1
-%endif
 
 %build
 export CFLAGS="%{optflags}"