diff --git a/.abf.yml b/.abf.yml
index ca19b76..5c9d8da 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,6 +1,6 @@
 removed_sources:
   samba-4.3.6.tar.gz: c9fd4f4ea48355e604ee1f40bf5d8e5ff9f2c692
+  samba-4.3.8.tar.gz: e7ff0e040e2b273ac14f1bb3b65d643c2abf0ca7
 sources:
   samba-4.3.6.tar.asc: ea64c34459b1667c739bd2a897ab152d7e65f9a8
-  samba-4.3.8.tar.gz: e7ff0e040e2b273ac14f1bb3b65d643c2abf0ca7
-  samba-pubkey.asc: 2ed9df9c70f97b5c478f0d2155f9c1e172e27359
+  samba-4.3.9.tar.gz: d31423f80918af52cd6d5b2005d76d02975dbfd5
diff --git a/samba-4.3.1-tirpc.patch b/samba-4.3.9-tirpc.patch
similarity index 53%
rename from samba-4.3.1-tirpc.patch
rename to samba-4.3.9-tirpc.patch
index 789649b..855e95d 100644
--- a/samba-4.3.1-tirpc.patch
+++ b/samba-4.3.9-tirpc.patch
@@ -1,6 +1,6 @@
-diff -urN samba-4.3.1/ctdb/wscript samba-4.3.1-patched/ctdb/wscript
---- samba-4.3.1/ctdb/wscript	2015-07-21 19:47:48.000000000 +1000
-+++ samba-4.3.1-patched/ctdb/wscript	2015-10-21 21:05:19.214855362 +1000
+diff -Naur samba-4.3.9.orig/ctdb/wscript samba-4.3.9/ctdb/wscript
+--- samba-4.3.9.orig/ctdb/wscript	2016-05-19 11:12:27.598521768 +0300
++++ samba-4.3.9/ctdb/wscript	2016-05-19 11:12:27.615521769 +0300
 @@ -406,6 +406,7 @@
                       source=bld.SUBDIR('utils/smnotify',
                                         'smnotify.c gen_smnotify.c gen_xdr.c'),
@@ -9,12 +9,12 @@ diff -urN samba-4.3.1/ctdb/wscript samba-4.3.1-patched/ctdb/wscript
                       includes='utils utils/smnotify',
                       install_path='${BINDIR}')
  
-diff -urN samba-4.3.1/source3/wscript_build samba-4.3.1-patched/source3/wscript_build
---- samba-4.3.1/source3/wscript_build	2015-07-21 19:47:49.000000000 +1000
-+++ samba-4.3.1-patched/source3/wscript_build	2015-10-21 20:54:14.757825125 +1000
-@@ -642,6 +642,7 @@
-                    ''' +
+diff -Naur samba-4.3.9.orig/source3/wscript_build samba-4.3.9/source3/wscript_build
+--- samba-4.3.9.orig/source3/wscript_build	2016-05-19 11:12:27.487521760 +0300
++++ samba-4.3.9/source3/wscript_build	2016-05-19 11:12:27.615521769 +0300
+@@ -637,6 +637,7 @@
                     bld.env['dmapi_lib'] +
+                    bld.env['legacy_quota_libs'] +
                     NOTIFY_DEPS,
 +                   ldflags='-ltirpc',
                     private_library=True)
diff --git a/samba-pubkey.asc b/samba-pubkey.asc
new file mode 100644
index 0000000..7ac54f9
--- /dev/null
+++ b/samba-pubkey.asc
@@ -0,0 +1,63 @@
+pub   1024D/6568B7EA 2007-02-04 [expires: 2016-01-17]
+uid                  Samba Distribution Verification Key <samba-bugs@samba.org>
+sub   2048g/DA6DFB44 2007-02-04 [expires: 2016-01-17]
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+9GHh4cjTsKMmRsY6FDkDm8mExQ==
+=nU8K
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/samba.spec b/samba.spec
index 6fad5d5..5ad726e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,5 +1,3 @@
-%define debug_package %{nil}
-
 # Useful commands for testing domain controller/OpenLDAP replacement
 # functionality:
 #
@@ -96,8 +94,8 @@
 
 Summary:	Samba SMB server
 Name:		samba
-Version:	4.3.8
-Release:	2
+Version:	4.3.9
+Release:	1
 Epoch:		1
 License:	GPLv3+
 Group:		System/Servers
@@ -120,7 +118,7 @@ Source29:	system-auth-winbind.pamd
 Source41:	openldap-samba.conf
 Source100:	%{name}.rpmlintrc
 # xdr_* functions have moved from glibc into libtirpc
-Patch0:		samba-4.3.1-tirpc.patch
+Patch0:		samba-4.3.9-tirpc.patch
 Patch1:		samba-4.3.6-autofree.patch
 
 # Required for ldb docs
@@ -1460,7 +1458,7 @@ fi
 %patch0 -p1 -b .tirpc~
 
 %build
-buildtools/bin/waf configure --enable-fhs \
+CFLAGS=-g buildtools/bin/waf configure --enable-fhs \
 	--with-privatelibdir=%{_libdir}/%{name} \
 	--bundled-libraries=heimdal,!zlib,!popt,!talloc,!tevent,!tdb,!ldb \
 	--enable-gnutls \