diff --git a/source/nmbd/nmbd_browsesync.c b/source/nmbd/nmbd_browsesync.c
index ca8d269cb00..381f65e0c85 100644
--- a/source/nmbd/nmbd_browsesync.c
+++ b/source/nmbd/nmbd_browsesync.c
@@ -320,7 +320,15 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec,
     zero_ip(&work->dmb_addr);
 
   /* Now initiate the node status request. */
-  make_nmb_name(&nmbname,"*",0x0);
+
+  /* We used to use the name "*",0x0 here, but some Windows
+   * servers don't answer that name. However we *know* they
+   * have the name workgroup#1b (as we just looked it up).
+   * So do the node status request on this name instead.
+   * Found at LBL labs. JRA.
+   */
+
+  make_nmb_name(&nmbname,work->work_group,0x1b);
 
   /* Put the workgroup name into the userdata so we know
      what workgroup we're talking to when the reply comes