diff --git a/source3/wscript b/source3/wscript
index 89ee79fe707..61e00aadacf 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -946,6 +946,20 @@ int i; i = PAM_RADIO_TYPE;
         if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
             conf.DEFINE('VALGRIND', '1')
 
+    if conf.CHECK_CODE('''
+#include <bits/sockaddr.h>
+#include <linux/netlink.h>
+''',
+		'HAVE_LINUX_NETLINK_H',
+                msg="Checking whether Linux netlink is available"):
+        conf.CHECK_CODE('''
+#include <bits/sockaddr.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+''',
+		'HAVE_LINUX_RTNETLINK_H',
+		msg='Checking whether Linux rtnetlink is available')
+
     conf.SAMBA_CONFIG_H('include/config.h')
 
 def ctags(ctx):
diff --git a/source3/wscript_build b/source3/wscript_build
index 600006970f9..23d55b970bc 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -80,6 +80,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           lib/util_sconn.c
           lib/serverid.c
           lib/util_transfer_file.c
+          lib/addrchange.c
           ${TDB_LIB_SRC}
           lib/debug.c lib/fault.c
           lib/interface.c lib/pidfile.c
@@ -604,6 +605,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 torture/denytest.c torture/mangle_test.c
                 torture/nbench.c
                 torture/test_async_echo.c
+                torture/test_addrchange.c
                 torture/test_posix_append.c
                 torture/test_smbsock_any_connect.c'''