diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c
index b0bedab01ea..2b1ca8d2ad1 100644
--- a/source4/utils/nmblookup.c
+++ b/source4/utils/nmblookup.c
@@ -189,7 +189,7 @@ static BOOL process_one(const char *name)
 	
 	if (options.find_master) {
 		node_type = NBT_NAME_MASTER;
-		if (*name == '-') {
+		if (*name == '-' || *name == '_') {
 			name = "\01\02__MSBROWSE__\02";
 			node_type = NBT_NAME_MS;
 		}