diff --git a/ldb-python3.5-fix-soabi_name.patch b/ldb-python3.5-fix-soabi_name.patch
new file mode 100644
index 0000000..bbcdda5
--- /dev/null
+++ b/ldb-python3.5-fix-soabi_name.patch
@@ -0,0 +1,13 @@
+Index: ldb-1.1.26/buildtools/wafsamba/wafsamba.py
+===================================================================
+--- ldb-1.1.26.orig/buildtools/wafsamba/wafsamba.py
++++ ldb-1.1.26/buildtools/wafsamba/wafsamba.py
+@@ -115,7 +115,7 @@ def SAMBA_LIBRARY(bld, libname, source,
+                   ldflags='',
+                   external_library=False,
+                   realname=None,
+-                  keep_underscore=False,
++                  keep_underscore=True,
+                   autoproto=None,
+                   autoproto_extra_source='',
+                   group='main',
diff --git a/ldb.changes b/ldb.changes
index 774e195..830b8fe 100644
--- a/ldb.changes
+++ b/ldb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar  8 12:49:48 UTC 2016 - dimstar@opensuse.org
+
+- Add ldb-python3.5-fix-soabi_name.patch: Do not change x86_64 to
+  x86-64 when building with python 3.5.
+
 -------------------------------------------------------------------
 Sun Feb 21 16:55:27 UTC 2016 - lmuelle@suse.com
 
diff --git a/ldb.spec b/ldb.spec
index 5c48672..1f8b85f 100644
--- a/ldb.spec
+++ b/ldb.spec
@@ -58,6 +58,7 @@ Source:         https://download.samba.org/pub/ldb/ldb-%{version}.tar.gz
 Source1:        https://download.samba.org/pub/ldb/ldb-%{version}.tar.asc
 Source2:        ldb.keyring
 Source4:        baselibs.conf
+Patch0:         ldb-python3.5-fix-soabi_name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,6 +164,7 @@ LDB library.
 
 %prep
 %setup -n ldb-%{version} -q
+%patch0 -p1
 
 %build
 %if 0%{?suse_version} && 0%{?suse_version} < 911