diff --git a/source/client/client.c b/source/client/client.c
index b450ed0cf93..6d9482ff28e 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -1639,8 +1639,6 @@ struct cli_state *do_connect(char *server, char *share)
 	
 	ip = ipzero;
 
-	strupper(server);
-
 	make_nmb_name(&calling, global_myname, 0x0, "");
 	make_nmb_name(&called , server, name_type, "");
 
@@ -1878,8 +1876,6 @@ static int do_message_op(void)
 
 	ip = ipzero;
 
-	strupper(desthost);
-
 	make_nmb_name(&calling, global_myname, 0x0, "");
 	make_nmb_name(&called , desthost, name_type, "");
 
@@ -2048,7 +2044,6 @@ static int do_message_op(void)
 		case 'M':
 			name_type = 0x03; /* messages are sent to NetBIOS name type 0x3 */
 			pstrcpy(desthost,optarg);
-			strupper(desthost);
 			message = True;
 			break;
 		case 'i':
@@ -2137,7 +2132,6 @@ static int do_message_op(void)
 	}
 
 	get_myname((*global_myname)?NULL:global_myname,NULL);  
-	strupper(global_myname);
 
 	if(*new_name_resolve_order)
 		lp_set_name_resolve_order(new_name_resolve_order);
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c
index 81f75d2cb2a..550f7cc391d 100644
--- a/source/libsmb/clientgen.c
+++ b/source/libsmb/clientgen.c
@@ -839,6 +839,7 @@ BOOL cli_send_tconX(struct cli_state *cli,
 
 	slprintf(fullshare, sizeof(fullshare)-1,
 		 "\\\\%s\\%s", cli->desthost, share);
+	strupper(fullshare);
 
 	set_message(cli->outbuf,4,
 		    2 + strlen(fullshare) + passlen + strlen(dev),True);
diff --git a/source/libsmb/nmblib.c b/source/libsmb/nmblib.c
index b91a2944a3e..7f3bcc9642a 100644
--- a/source/libsmb/nmblib.c
+++ b/source/libsmb/nmblib.c
@@ -764,12 +764,12 @@ static int build_dgram(char *buf,struct packet_struct *p)
  *******************************************************************/
 void make_nmb_name( struct nmb_name *n, const char *name, int type, const char *this_scope )
 {
-  memset( (char *)n, '\0', sizeof(struct nmb_name) );
-  StrnCpy( n->name, name, 15 );
-  strupper( n->name );
-  n->name_type = (unsigned int)type & 0xFF;
-  StrnCpy( n->scope, this_scope, 63 );
-  strupper( n->scope );
+	memset( (char *)n, '\0', sizeof(struct nmb_name) );
+	StrnCpy( n->name, name, 15 );
+	strupper( n->name );
+	n->name_type = (unsigned int)type & 0xFF;
+	StrnCpy( n->scope, this_scope, 63 );
+	strupper( n->scope );
 }
 
 /*******************************************************************