diff --git a/xCAT-nbroot2/bmcsetup b/xCAT-nbroot2/bmcsetup
index 3ed8bec85..abe6641c8 100755
--- a/xCAT-nbroot2/bmcsetup
+++ b/xCAT-nbroot2/bmcsetup
@@ -76,6 +76,13 @@ elif [ "$IPMIMFG" == 20301 ] ; then
 	    	let idev=NUMBMCS-1
 		    for p in $BMCPORT; do
 	            	ipmitool -d $idev raw 0xc 1 1 0xc0 $BMCPORT > /dev/null
+		        NEWPORT=`ipmitool -d $idev raw 0xc 2 1 0xc0 0 0|awk '{print $2}'`
+			while [ "$NEWPORT" != "$BMCPORT" ]; do
+				sleep 0.1
+		        	NEWPORT=`ipmitool -d $idev raw 0xc 2 1 0xc0 0 0|awk '{print $2}'`
+			done
+			sleep 5
+
 		    	let idev=idev-1
 		    done
         fi