diff --git a/dont_remove_underscore.patch b/dont_remove_underscore.patch
new file mode 100644
index 0000000..170a0cd
--- /dev/null
+++ b/dont_remove_underscore.patch
@@ -0,0 +1,11 @@
+--- a/buildtools/wafsamba/wafsamba.py	2015-11-06 08:28:25.000000000 -0500
++++ b/buildtools/wafsamba/wafsamba.py	2016-03-07 14:28:58.412124485 -0500
+@@ -114,7 +114,7 @@
+                   ldflags='',
+                   external_library=False,
+                   realname=None,
+-                  keep_underscore=False,
++                  keep_underscore=True,
+                   autoproto=None,
+                   autoproto_extra_source='',
+                   group='main',
diff --git a/talloc-man.changes b/talloc-man.changes
index e17a1fb..fbdb49b 100644
--- a/talloc-man.changes
+++ b/talloc-man.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar  7 19:48:09 UTC 2016 - toddrme2178@gmail.com
+
+- Add dont_remove_underscore.patch
+  wafsamba.py was stripping underscores from the SOABI, changing
+  the library names from what they should be.  This fixes that.
+  This fixes compatibility with python 3.5+ on openSUSE.
+
 -------------------------------------------------------------------
 Sun Feb 21 16:44:01 UTC 2016 - lmuelle@suse.com
 
diff --git a/talloc-man.spec b/talloc-man.spec
index b2d359a..d847709 100644
--- a/talloc-man.spec
+++ b/talloc-man.spec
@@ -61,6 +61,8 @@ Group:          System/Libraries
 Source:         http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz
 Source1:        http://download.samba.org/pub/talloc/talloc-%{version}.tar.asc
 Source4:        baselibs.conf
+# PATCH-FIX-OPENSUSE dont_remove_underscore.patch - keep original python ABI name
+Patch0:         dont_remove_underscore.patch
 Source50:       talloc.keyring
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -173,6 +175,7 @@ Libraries and Header Files to Develop Programs with python3-talloc Support
 
 %prep
 %setup -n talloc-%{version} -q
+%patch0 -p1
 
 %build
 %if ! %{build_man}
diff --git a/talloc.changes b/talloc.changes
index e17a1fb..fbdb49b 100644
--- a/talloc.changes
+++ b/talloc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar  7 19:48:09 UTC 2016 - toddrme2178@gmail.com
+
+- Add dont_remove_underscore.patch
+  wafsamba.py was stripping underscores from the SOABI, changing
+  the library names from what they should be.  This fixes that.
+  This fixes compatibility with python 3.5+ on openSUSE.
+
 -------------------------------------------------------------------
 Sun Feb 21 16:44:01 UTC 2016 - lmuelle@suse.com
 
diff --git a/talloc.spec b/talloc.spec
index 3300669..55ed624 100644
--- a/talloc.spec
+++ b/talloc.spec
@@ -61,6 +61,8 @@ Group:          System/Libraries
 Source:         http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz
 Source1:        http://download.samba.org/pub/talloc/talloc-%{version}.tar.asc
 Source4:        baselibs.conf
+# PATCH-FIX-OPENSUSE dont_remove_underscore.patch - keep original python ABI name
+Patch0:         dont_remove_underscore.patch
 Source50:       talloc.keyring
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -173,6 +175,7 @@ Libraries and Header Files to Develop Programs with python3-talloc Support
 
 %prep
 %setup -n talloc-%{version} -q
+%patch0 -p1
 
 %build
 %if ! %{build_man}