diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 6d9ea419f8d..0f30ab1fb88 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -96,6 +96,16 @@ connection_struct *conn_new(struct smbd_server_connection *sconn)
 		TALLOC_FREE(conn);
 		return NULL;
 	}
+	conn->cwd_fsp->fsp_name = synthetic_smb_fname(conn->cwd_fsp,
+						      ".",
+						      NULL,
+						      NULL,
+						      0,
+						      0);
+	if (conn->cwd_fsp->fsp_name == NULL) {
+		TALLOC_FREE(conn);
+		return NULL;
+	}
 	conn->cwd_fsp->fh = talloc_zero(conn->cwd_fsp, struct fd_handle);
 	if (conn->cwd_fsp->fh == NULL) {
 		DBG_ERR("talloc_zero failed\n");
diff --git a/source3/wscript_build b/source3/wscript_build
index ac442ca3410..5a07eddac44 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -589,7 +589,7 @@ bld.SAMBA3_LIBRARY('smbconf',
 
 bld.SAMBA3_LIBRARY('smbd_conn',
                    source='smbd/conn.c',
-                   deps='samba3-util samba-util',
+                   deps='samba3-util samba-util FNAME_UTIL',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('sysquotas',