diff --git a/source/auth/config.mk b/source/auth/config.mk
index e75f36bdda2..c34a941d121 100644
--- a/source/auth/config.mk
+++ b/source/auth/config.mk
@@ -55,7 +55,7 @@ OBJ_FILES = auth_developer.o
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = auth
 OBJ_FILES = auth_unix.o
-PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS
+PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
 # End MODULE auth_unix
 #######################
 
diff --git a/source/configure.ac b/source/configure.ac
index 52be29c0228..520808051e4 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -85,6 +85,7 @@ m4_include(scripting/swig/config.m4)
 m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
 m4_include(lib/socket_wrapper/config.m4)
+m4_include(lib/nss_wrapper/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
diff --git a/source/configure.developer b/source/configure.developer
index b8cf6d68b10..50336702095 100755
--- a/source/configure.developer
+++ b/source/configure.developer
@@ -2,4 +2,5 @@
 `dirname $0`/configure -C \
 	--enable-developer \
 	--enable-socket-wrapper \
+	--enable-nss-wrapper \
 	"$@"
diff --git a/source/dsdb/samdb/ldb_modules/config.mk b/source/dsdb/samdb/ldb_modules/config.mk
index a93dea7db75..48f2ad38138 100644
--- a/source/dsdb/samdb/ldb_modules/config.mk
+++ b/source/dsdb/samdb/ldb_modules/config.mk
@@ -81,7 +81,7 @@ OBJ_FILES = \
 [MODULE::ldb_samba3sam]
 SUBSYSTEM = LIBLDB
 INIT_FUNCTION = ldb_samba3sam_module_init
-PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD
+PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER
 OBJ_FILES = \
 		samba3sam.o
 #
diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index 266ca6e685a..0fc07bcd899 100644
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -10,6 +10,7 @@ include messaging/config.mk
 include events/config.mk
 include cmdline/config.mk
 include socket_wrapper/config.mk
+include nss_wrapper/config.mk
 include appweb/config.mk
 include stream/config.mk
 include util/config.mk
diff --git a/source/ntvfs/unixuid/config.mk b/source/ntvfs/unixuid/config.mk
index d078e9f5c64..91976c6811b 100644
--- a/source/ntvfs/unixuid/config.mk
+++ b/source/ntvfs/unixuid/config.mk
@@ -5,6 +5,6 @@ INIT_FUNCTION = ntvfs_unixuid_init
 SUBSYSTEM = ntvfs
 OBJ_FILES = \
 		vfs_unixuid.o
-PRIVATE_DEPENDENCIES = SAMDB
+PRIVATE_DEPENDENCIES = SAMDB NSS_WRAPPER
 # End MODULE ntvfs_unixuid
 ################################################
diff --git a/source/rpc_server/config.mk b/source/rpc_server/config.mk
index 1269dcc7074..d794b9470d3 100644
--- a/source/rpc_server/config.mk
+++ b/source/rpc_server/config.mk
@@ -82,7 +82,8 @@ OBJ_FILES = \
 PRIVATE_DEPENDENCIES = \
 		DCERPC_COMMON \
 		SAMDB \
-		NDR_UNIXINFO
+		NDR_UNIXINFO \
+		NSS_WRAPPER
 # End MODULE dcerpc_unixinfo
 ################################################
 
diff --git a/source/scripting/ejs/config.mk b/source/scripting/ejs/config.mk
index 5d562ee344e..1916854f7b5 100644
--- a/source/scripting/ejs/config.mk
+++ b/source/scripting/ejs/config.mk
@@ -43,6 +43,7 @@ INIT_FUNCTION = smb_setup_ejs_random
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_nss
+PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o