diff --git a/.gitignore b/.gitignore
index bb7ddb8..c8e71bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ tevent-0.9.8.tar.gz
 /tevent-0.9.34.tar.gz
 /tevent-0.9.35.tar.gz
 /tevent-0.9.36.tar.gz
+/tevent-0.9.37.tar.gz
diff --git a/libtevent.spec b/libtevent.spec
index 33db80d..dd76700 100644
--- a/libtevent.spec
+++ b/libtevent.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name: libtevent
-Version: 0.9.36
-Release: 3%{?dist}
+Version: 0.9.37
+Release: 1%{?dist}
 Summary: The tevent library
 License: LGPLv3+
 URL: http://tevent.samba.org/
@@ -28,6 +28,9 @@ BuildRequires: libxslt
 
 Provides: bundled(libreplace)
 
+Patch0001: tevent-dont-use-usr-bin-env-python.patch
+Patch0002: tevent-hide-local-ABI-symbols.patch
+
 %if 0%{?with_python3}
 BuildRequires: python3-devel
 BuildRequires: python3-talloc-devel >= 2.0.7
@@ -88,7 +91,7 @@ UpdateTimestamps() {
   done
 }
 
-%setup -q -n tevent-%{version}
+%autosetup -n tevent-%{version} -p1
 
 %build
 
@@ -150,6 +153,12 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
 %endif
 
 %changelog
+* Thu Jul 12 2018 Jakub Hrozek <jhrozek@redhat.com> - 0.9.37-1
+- New upstream release 0.9.37
+- Apply a patch to hide local ABI symbols to avoid issues with new binutils
+- Patch the waf script to explicitly call python2 as "env python" doesn't
+  yield py2 anymore
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.9.36-3
 - Rebuilt for Python 3.7
 
diff --git a/sources b/sources
index c579389..76b2e49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tevent-0.9.36.tar.gz) = bca9db9bcf142ba68b207180d19414dddb89a069a4f040383069c8af0df5bb184ca219293c4a1e7b0bc241b9a1ea3d414f8284278ad3a5f0383b9e432450167b
+SHA512 (tevent-0.9.37.tar.gz) = 5d4833403e1c2f2749f00a389e4757261a4f22cd3a67c906001b36a8b622cc68a38e86d4eb475848a2121ebba054a7e7dac7f486d9f2906a401c3cc97fb447f4
diff --git a/tevent-dont-use-usr-bin-env-python.patch b/tevent-dont-use-usr-bin-env-python.patch
new file mode 100644
index 0000000..4a0c658
--- /dev/null
+++ b/tevent-dont-use-usr-bin-env-python.patch
@@ -0,0 +1,8 @@
+diff -up tevent-0.9.37/buildtools/bin/waf.envpy tevent-0.9.37/buildtools/bin/waf
+--- tevent-0.9.37/buildtools/bin/waf.envpy	2018-07-12 13:54:01.482844881 +0200
++++ tevent-0.9.37/buildtools/bin/waf	2018-07-12 13:54:22.183967196 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # encoding: ISO-8859-1
+ # Thomas Nagy, 2005-2010
diff --git a/tevent-hide-local-ABI-symbols.patch b/tevent-hide-local-ABI-symbols.patch
new file mode 100644
index 0000000..375af94
--- /dev/null
+++ b/tevent-hide-local-ABI-symbols.patch
@@ -0,0 +1,20 @@
+diff -up tevent-0.9.37/buildtools/wafsamba/samba_abi.py.sym_hide tevent-0.9.37/buildtools/wafsamba/samba_abi.py
+--- tevent-0.9.37/buildtools/wafsamba/samba_abi.py.sym_hide	2018-07-12 14:00:27.787127410 +0200
++++ tevent-0.9.37/buildtools/wafsamba/samba_abi.py	2018-07-12 14:00:41.698209606 +0200
+@@ -192,10 +192,12 @@ def abi_write_vscript(f, libname, curren
+             f.write("\t\t%s;\n" % x)
+     else:
+         f.write("\t\t*;\n")
+-    if abi_match != ["*"]:
+-        f.write("\tlocal:\n")
+-        for x in local_abi:
+-            f.write("\t\t%s;\n" % x[1:])
++    # Always hide symbols that must be local if exist
++    local_abi.extend(["!_end", "!_bss_start", "!_edata"])
++    f.write("\tlocal:\n")
++    for x in local_abi:
++        f.write("\t\t%s;\n" % x[1:])
++    if global_abi != ["*"]:
+         if len(global_abi) > 0:
+             f.write("\t\t*;\n")
+     f.write("};\n")