diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index 46f2098..8d4da4d 100644
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -150,23 +150,30 @@ static void expire_names_and_servers(time_t t)
 
 /************************************************************************** **
  Reload the list of network interfaces.
+ Doesn't return until a network interface is up.
  ************************************************************************** */
 
-static BOOL reload_interfaces(time_t t)
+static void reload_interfaces(time_t t)
 {
 	static time_t lastt;
 	int n;
 	struct subnet_record *subrec;
 
-	if (t && ((t - lastt) < NMBD_INTERFACES_RELOAD)) return False;
+	if (t && ((t - lastt) < NMBD_INTERFACES_RELOAD)) {
+		return;
+	}
 	lastt = t;
 
-	if (!interfaces_changed()) return False;
+	if (!interfaces_changed()) {
+		return;
+	}
 
 	/* the list of probed interfaces has changed, we may need to add/remove
 	   some subnets */
 	load_interfaces();
 
+  try_again:
+
 	/* find any interfaces that need adding */
 	for (n=iface_count() - 1; n >= 0; n--) {
 		struct interface *iface = get_interface(n);
@@ -221,15 +228,35 @@ static BOOL reload_interfaces(time_t t)
 			close_subnet(subrec);
 		}
 	}
-	
+
 	rescan_listen_set = True;
 
-	/* We need to shutdown if there are no subnets... */
+	/* We need to wait if there are no subnets... */
 	if (FIRST_SUBNET == NULL) {
-		DEBUG(0,("reload_interfaces: No subnets to listen to. Shutting down...\n"));
-		return True;
+		void (*saved_handler)(int);
+
+		DEBUG(2,("reload_interfaces: "
+			"No subnets to listen to. Waiting..\n"));
+
+		/*
+		 * Whilst we're waiting for an interface, allow SIGTERM to
+		 * cause us to exit.
+		 */
+
+		saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+
+                while (iface_count() == 0) {
+			sleep(5);
+			load_interfaces();
+		}
+
+		/*
+		 * We got an interface, restore our normal term handler.
+		 */
+
+		CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+		goto try_again;
 	}
-	return False;
 }
 
 /**************************************************************************** **
@@ -267,8 +294,6 @@ static BOOL reload_nmbd_services(BOOL test)
 
 /**************************************************************************** **
  * React on 'smbcontrol nmbd reload-config' in the same way as to SIGHUP
- * We use buf here to return BOOL result to process() when reload_interfaces()
- * detects that there are no subnets.
  **************************************************************************** */
 
 static void msg_reload_nmbd_services(int msg_type, struct process_id src,
@@ -278,14 +303,7 @@ static void msg_reload_nmbd_services(int msg_type, struct process_id src,
 	dump_all_namelists();
 	reload_nmbd_services( True );
 	reopen_logs();
-	
-	if(buf) {
-		/* We were called from process() */
-		/* If reload_interfaces() returned True */
-		/* we need to shutdown if there are no subnets... */
-		/* pass this info back to process() */
-		*((BOOL*)buf) = reload_interfaces(0);  
-	}
+	reload_interfaces(0);
 }
 
 static void msg_nmbd_send_packet(int msg_type, struct process_id src,
@@ -348,7 +366,6 @@ static void msg_nmbd_send_packet(int msg_type, struct process_id src,
 static void process(void)
 {
 	BOOL run_election;
-	BOOL no_subnets;
 
 	while( True ) {
 		time_t t = time(NULL);
@@ -558,19 +575,16 @@ static void process(void)
 		if(reload_after_sighup) {
 			DEBUG( 0, ( "Got SIGHUP dumping debug info.\n" ) );
 			msg_reload_nmbd_services(MSG_SMB_CONF_UPDATED,
-						 pid_to_procid(0), (void*) &no_subnets, 0, NULL);
-			if(no_subnets)
-				return;
+						 pid_to_procid(0), NULL, 0, NULL);
 			reload_after_sighup = 0;
 		}
 
 		/* check for new network interfaces */
 
-		if(reload_interfaces(t))
-			return;
+		reload_interfaces(t);
 
 		/* free up temp memory */
-			lp_TALLOC_FREE();
+		lp_TALLOC_FREE();
 	}
 }
 
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 75b631c..fc75486 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -1428,7 +1428,8 @@ static int net_ads_join_usage(int argc, const char **argv)
 	d_printf("                      The OU string read from top to bottom without RDNs and delimited by a '/'.\n");
 	d_printf("                      E.g. \"createcomputer=Computers/Servers/Unix\"\n");
 	d_printf("                      NB: A backslash '\\' is used as escape at multiple levels and may\n");
-	d_printf("                          need to be doubled or even quadrupled.  It is not used as a separator");
+	d_printf("                          need to be doubled or even quadrupled.  It is not used as a separator\n");
+	d_printf("   nospn		Don't create the service principal name. This should not be used in normal operation\n");
 
 	return -1;
 }
@@ -1447,6 +1448,7 @@ int net_ads_join(int argc, const char **argv)
 	TALLOC_CTX *ctx = NULL;
 	DOM_SID *domain_sid = NULL;
 	BOOL createupn = False;
+	BOOL createspn = True;
 	const char *machineupn = NULL;
 	const char *create_in_ou = NULL;
 	int i;
@@ -1487,34 +1489,32 @@ int net_ads_join(int argc, const char **argv)
 	}
 
 	/* process additional command line args */
-	
+
 	for ( i=0; i<argc; i++ ) {
 		if ( !StrnCaseCmp(argv[i], "createupn", strlen("createupn")) ) {
 			createupn = True;
 			machineupn = get_string_param(argv[i]);
-		}
-		else if ( !StrnCaseCmp(argv[i], "createcomputer", strlen("createcomputer")) ) {
+		} else if (strequal(argv[i], "nospn")) {
+			createspn = False;
+		} else if ( !StrnCaseCmp(argv[i], "createcomputer", strlen("createcomputer")) ) {
 			if ( (create_in_ou = get_string_param(argv[i])) == NULL ) {
 				d_fprintf(stderr, "Please supply a valid OU path.\n");
 				nt_status = NT_STATUS_INVALID_PARAMETER;
 				goto fail;
-			}		
-		}
-		else if ( !StrnCaseCmp(argv[i], "osName", strlen("osName")) ) {
+			}
+		} else if ( !StrnCaseCmp(argv[i], "osName", strlen("osName")) ) {
 			if ( (os_name = get_string_param(argv[i])) == NULL ) {
 				d_fprintf(stderr, "Please supply a operating system name.\n");
 				nt_status = NT_STATUS_INVALID_PARAMETER;
 				goto fail;
-			}		
-		}
-		else if ( !StrnCaseCmp(argv[i], "osVer", strlen("osVer")) ) {
+			}
+		} else if ( !StrnCaseCmp(argv[i], "osVer", strlen("osVer")) ) {
 			if ( (os_version = get_string_param(argv[i])) == NULL ) {
 				d_fprintf(stderr, "Please supply a valid operating system version.\n");
 				nt_status = NT_STATUS_INVALID_PARAMETER;
 				goto fail;
-			}		
-		}
-		else {
+			}
+		} else {
 			d_fprintf(stderr, "Bad option: %s\n", argv[i]);
 			nt_status = NT_STATUS_INVALID_PARAMETER;
 			goto fail;
@@ -1580,31 +1580,33 @@ int net_ads_join(int argc, const char **argv)
 	if ( net_rpc_join_ok(short_domain_name, ads->config.ldap_server_name, &ads->ldap_ip) != 0 ) {
 		d_fprintf(stderr, "Failed to verify membership in domain!\n");
 		goto fail;
-	}	
+	}
 
 	/* create the dNSHostName & servicePrincipalName values */
-	
-	status = net_set_machine_spn( ctx, ads );
-	if ( !ADS_ERR_OK(status) )  {
 
-		d_fprintf(stderr, "Failed to set servicePrincipalNames. Please ensure that\n");
-		d_fprintf(stderr, "the DNS domain of this server matches the AD domain,\n");
-		d_fprintf(stderr, "Or rejoin with using Domain Admin credentials.\n");
-		
-		/* Disable the machine account in AD.  Better to fail than to leave 
-		   a confused admin.  */
-		
-		if ( net_ads_leave( 0, NULL ) != 0 ) {
-			d_fprintf( stderr, "Failed to disable machine account in AD.  Please do so manually.\n");
+	if (createspn) {
+		status = net_set_machine_spn( ctx, ads );
+		if ( !ADS_ERR_OK(status) )  {
+
+			d_fprintf(stderr, "Failed to set servicePrincipalNames. Please ensure that\n");
+			d_fprintf(stderr, "the DNS domain of this server matches the AD domain,\n");
+			d_fprintf(stderr, "Or rejoin with using Domain Admin credentials.\n");
+
+			/* Disable the machine account in AD.  Better to fail than to leave 
+			   a confused admin.  */
+
+			if ( net_ads_leave( 0, NULL ) != 0 ) {
+				d_fprintf( stderr, "Failed to disable machine account in AD.  Please do so manually.\n");
+			}
+
+			/* clear out the machine password */
+
+			netdom_store_machine_account( lp_workgroup(), domain_sid, "" ); 
+			netdom_store_machine_account( short_domain_name, domain_sid, "" );
+
+			nt_status = ads_ntstatus(status);
+			goto fail;
 		}
-		
-		/* clear out the machine password */
-		
-		netdom_store_machine_account( lp_workgroup(), domain_sid, "" ); 
-		netdom_store_machine_account( short_domain_name, domain_sid, "" );
-		
-		nt_status = ads_ntstatus(status);
-		goto fail;
 	}
 
 	if ( !net_derive_salting_principal( ctx, ads ) ) {