diff --git a/xCAT-nbroot2/dhclient-script b/xCAT-nbroot2/dhclient-script
index d72ac0206..53184410a 100755
--- a/xCAT-nbroot2/dhclient-script
+++ b/xCAT-nbroot2/dhclient-script
@@ -51,5 +51,9 @@ elif [ $reason = "RELEASE" ]; then
 	if [ ! -z "$old_ip_address" ]; then
 		ip addr del dev $interface $old_ip_address/$old_subnet_mask
 	fi
+elif [ $reason = "RELEASE6" ]; then
+	if [ ! -z "$old_ip6_address" ]; then
+		ip addr del dev $interface $old_ip6_address/$old_ip6_prefixlen
+	fi
 fi
 exit 0
diff --git a/xCAT-nbroot2/dodiscovery b/xCAT-nbroot2/dodiscovery
index f6f6c9486..104cf335d 100755
--- a/xCAT-nbroot2/dodiscovery
+++ b/xCAT-nbroot2/dodiscovery
@@ -1,6 +1,6 @@
 #!/bin/sh
 minixcatd.awk &
-PUBKEY=`openssl rsa -in /etc/xcat/privkey.pem -pubout|grep -v "PUBLIC KEY"`
+PUBKEY=`openssl rsa -in /etc/xcat/privkey.pem -pubout 2> /dev/null|grep -v "PUBLIC KEY"`
 PUBKEY=`echo $PUBKEY|sed -e 's/ //g'`
 export PUBKEY
 
@@ -34,14 +34,14 @@ while [ ! -z "$NICSGETTINGADDR" -a $timewaiting != 700 ]; do
 	done
 	sleep 0.1
 	timewaiting=$((timewaiting+1))
-	if [ $timewaiting = 450 ]; then
-		echo "45 seconds without an address on $nic, is spanning tree set to slow?"
-	fi
 	if [ $timewaiting = 699 ]; then
 		echo "No DHCP answer for $nic, ignoring interface"
 	fi
 	NICSGETTINGADDR=$NEWNICSGETTINGADDR
 done
+if [ $timewaiting != 700 -a $timewaiting -gt 450 ]; then
+	echo "Got an address, but it took inordinately long, you may want to check spanning tree configuration"
+fi
 echo "Stopped waiting on nics to get addresses"
 XCATPORT=3001
 export XCATPORT
diff --git a/xCAT-nbroot2/install b/xCAT-nbroot2/install
index e3f288b0b..3d312a265 100755
--- a/xCAT-nbroot2/install
+++ b/xCAT-nbroot2/install
@@ -6,7 +6,7 @@ dracut_install mount.nfs sshd vi reboot lspci parted screen libvirtd /usr/share/
 dracut_install mkswap df brctl vconfig ifenslave ssh-keygen /usr/bin/qemu-img /usr/libexec/qemu-kvm scp clear dhclient lldpad
 dracut_install lldptool /lib64/libnss_dns-2.12.so /lib64/libnss_dns.so.2
 dracut_install poweroff ntpq ntpd hwclock date /usr/share/terminfo/x/xterm /etc/nsswitch.conf /etc/services
-dracut_install /sbin/rsyslogd /etc/protocols umount
+dracut_install /sbin/rsyslogd /etc/protocols umount /bin/rpm /usr/lib/rpm/rpmrc
 dracut_install chmod /lib/libc.so.6 /lib/ld-linux.so.2 /lib/libdl.so.2 /lib/libm.so.6 /sbin/route /sbin/ifconfig /usr/bin/head /etc/redhat-release ping tr lsusb /usr/share/hwdata/usb.ids #ibm fw wrapper requirements
 dracut_install dmidecode /usr/lib64/libstdc++.so.6 #uxspi prereqs, but will use dmidecode to improve decision on loading ipmi_si
 dracut_install /usr/share/zoneinfo/posix/Zulu
diff --git a/xCAT-nbroot2/installkernel b/xCAT-nbroot2/installkernel
index a200f3e1f..7a1c08dfc 100755
--- a/xCAT-nbroot2/installkernel
+++ b/xCAT-nbroot2/installkernel
@@ -1,4 +1,4 @@
 #!/bin/bash
 instmods nfs sunrpc
-instmods e1000 e1000e virtio_net igb ines mlx4_en cxgb3 cxgb4 bnx2 bnx2x bna ixgb qlge mpt2sas ata_piix megaraid_sas virtio_blk ahci ibmaem xhci-hcd sd_mod pmcraid be2net ext3 ext4 btrfs reiserfs usb_storage scsi_wait_scan kvm kvm-intel kvm-amd ipmi_si ipmi_devintf
+instmods e1000 e1000e virtio_net igb ines mlx4_en cxgb3 cxgb4 bnx2 bnx2x bna ixgb qlge mptsas mpt2sas ata_piix megaraid_sas virtio_blk ahci ibmaem xhci-hcd sd_mod pmcraid be2net ext3 ext4 btrfs reiserfs usb_storage scsi_wait_scan kvm kvm-intel kvm-amd ipmi_si ipmi_devintf
 instmods macvlan macvtap 8021q bridge bonding vmxnet3 acpi-cpufreq powernow-k8 cdc_ether
diff --git a/xCAT-nbroot2/restart b/xCAT-nbroot2/restart
index 93bfb145c..059ade921 100755
--- a/xCAT-nbroot2/restart
+++ b/xCAT-nbroot2/restart
@@ -30,8 +30,8 @@ while [ $WAITING -gt 0 ]; do
     done
     for pidfile in /var/run/dhclient6.*.pid; do
 	NIC=`echo $pidfile|awk -F. '{print $2}'`
-	dhclient -r -pf $pidfile -lf /var/lib/dhclient/dhclient6.leases $NIC
-	dhclient -6 -r -pf $pidfile -nw -lf /var/lib/dhclient/dhclient6.leases $NIC
+	dhclient -6 -r -pf $pidfile -lf /var/lib/dhclient/dhclient6.leases $NIC
+	dhclient -6 -pf $pidfile -nw -lf /var/lib/dhclient/dhclient6.leases $NIC
     done
     
     echo -n "Waiting 10 seconds for DHCP changes to take effect "
diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 00e47b694..5c3e1d070 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -389,13 +389,13 @@ sub addnode
         if ($nrent and $nrent->{netboot} and $nrent->{netboot} eq 'xnba' and $lstatements !~ /filename/) {
             if (-f "$tftpdir/xcat/xnba.kpxe") {
                 if ($doiscsi and $chainent and $chainent->{currstate} and ($chainent->{currstate} eq 'iscsiboot' or $chainent->{currstate} eq 'boot')) {
-                    $lstatements = 'if client-architecture = 00:00 and not gpxe.bus-id { filename = \"xcat/xnba.kpxe\"; } else { filename = \"\"; } '.$lstatements;
+                    $lstatements = 'if option client-architecture = 00:00 and not gpxe.bus-id { filename = \"xcat/xnba.kpxe\"; } else { filename = \"\"; } '.$lstatements;
                 } else {
 			#TODO: if windows uefi, do vendor-class-identifier of "PXEClient" to bump it over to proxydhcp.c
 		    if ($douefi) {
-                        $lstatements = 'if option user-class-identifier = \"xNBA\" and client-architecture = 00:00 { filename = \"http://'.$nxtsrv.'/tftpboot/xcat/xnba/nodes/'.$node.'\"; } else if option user-class-identifier = \"xNBA\" and client-architecture = 00:09 { filename = \"http://'.$nxtsrv.'/tftpboot/xcat/xnba/nodes/'.$node.'.uefi\"; } else if client-architecture = 00:07 { filename = \"xcat/xnba.efi\"; } else if client-architecture = 00:00 { filename = \"xcat/xnba.kpxe\"; } else { filename = \"\"; }'.$lstatements; #Only PXE compliant clients should ever receive xNBA
+                        $lstatements = 'if option user-class-identifier = \"xNBA\" and option client-architecture = 00:00 { filename = \"http://'.$nxtsrv.'/tftpboot/xcat/xnba/nodes/'.$node.'\"; } else if option user-class-identifier = \"xNBA\" and option client-architecture = 00:09 { filename = \"http://'.$nxtsrv.'/tftpboot/xcat/xnba/nodes/'.$node.'.uefi\"; } else if option client-architecture = 00:07 { filename = \"xcat/xnba.efi\"; } else if option client-architecture = 00:00 { filename = \"xcat/xnba.kpxe\"; } else { filename = \"\"; }'.$lstatements; #Only PXE compliant clients should ever receive xNBA
 		    } else {
-                        $lstatements = 'if option user-class-identifier = \"xNBA\" and client-architecture = 00:00 { filename = \"http://'.$nxtsrv.'/tftpboot/xcat/xnba/nodes/'.$node.'\"; } else if client-architecture = 00:00 { filename = \"xcat/xnba.kpxe\"; } else { filename = \"\"; }'.$lstatements; #Only PXE compliant clients should ever receive xNBA
+                        $lstatements = 'if option user-class-identifier = \"xNBA\" and option client-architecture = 00:00 { filename = \"http://'.$nxtsrv.'/tftpboot/xcat/xnba/nodes/'.$node.'\"; } else if option client-architecture = 00:00 { filename = \"xcat/xnba.kpxe\"; } else { filename = \"\"; }'.$lstatements; #Only PXE compliant clients should ever receive xNBA
 		   }
                 } 
             } #TODO: warn when windows