diff --git a/xCAT/postscripts/HPCbootstatus.aix b/xCAT/postscripts/HPCbootstatus.aix
index 41b21aa59..dbb853046 100644
--- a/xCAT/postscripts/HPCbootstatus.aix
+++ b/xCAT/postscripts/HPCbootstatus.aix
@@ -13,7 +13,20 @@ my $passed = 0;
 # Set sleep time
 my $interval = 15;
 
-my $master = "192.168.5.128";
+my $master;
+
+# Get server IP from xcatinfo file
+if (-f "/etc/xcatinfo") {
+	# if this file exists assume it has the correct server name
+	my $cmd = "cat /etc/xcatinfo | grep 'XCATSERVER'";
+	my $SNline = `$cmd`;
+	my ($junk, $servnode) =  split(/=/, $SNline);
+	chomp $servnode; 
+	$servnode =~ s/^\s*//;
+	if ($servnode) {
+		$master = $servnode;
+	}
+}
 
 my $gpfsd = "hpcbootstatus gpfs-daemon=up";
 my $gpfsq = "hpcbootstatus gpfs-quorum=achieved";
diff --git a/xCAT/postscripts/HPCbootstatus.linux b/xCAT/postscripts/HPCbootstatus.linux
index ce552fd79..ed50dfad1 100644
--- a/xCAT/postscripts/HPCbootstatus.linux
+++ b/xCAT/postscripts/HPCbootstatus.linux
@@ -16,6 +16,17 @@ ITEMNUM=6
 gpfsd="hpcbootstatus gpfs-daemon=up"
 gpfsq="hpcbootstatus gpfs-quorum=achieved"
 
+# Get server IP from xcatinfo file
+if [ -f /opt/xcat/xcatinfo ]; then
+    SIP=`cut -d= -f2 /opt/xcat/xcatinfo`
+    if [ -n "$SIP" ]; then
+        MASTER=$SIP
+    fi
+else
+    echo "xCAT management server IP can't be determined.\nexiting..."
+    exit
+fi
+
 # Use a loop
 while [ true ]; do