diff --git a/source/libsmb/nmblib.c b/source/libsmb/nmblib.c
index b833a2f5df3..23eac9ad7cc 100644
--- a/source/libsmb/nmblib.c
+++ b/source/libsmb/nmblib.c
@@ -823,7 +823,7 @@ static int build_dgram(char *buf,struct packet_struct *p)
 void make_nmb_name( struct nmb_name *n, const char *name, int type)
 {
 	memset( (char *)n, '\0', sizeof(struct nmb_name) );
-	push_ascii(n->name, name, 16, STR_TERMINATE|STR_UPPER);
+	push_ascii(n->name, name, sizeof(n->name), STR_TERMINATE|STR_UPPER);
 	n->name_type = (unsigned int)type & 0xFF;
 	StrnCpy( n->scope, global_scope(), 63 );
 	strupper_m( n->scope );
diff --git a/source/nmbd/nmbd_winsserver.c b/source/nmbd/nmbd_winsserver.c
index cd39dc5e212..784c909c814 100644
--- a/source/nmbd/nmbd_winsserver.c
+++ b/source/nmbd/nmbd_winsserver.c
@@ -120,7 +120,7 @@ static void wins_hook(const char *operation, struct name_record *namerec, int tt
 	p += slprintf(p, sizeof(command)-1, "%s %s %s %02x %d", 
 		      cmd,
 		      operation, 
-		      namerec->name.name,
+		      nmb_namestr(&namerec->name),
 		      namerec->name.name_type,
 		      ttl);