diff --git a/buildcore.sh b/buildcore.sh
index 424153683..b6f45a72c 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -69,6 +69,14 @@ if $GREP xCAT-server ../coresvnup; then
    mv /usr/src/$pkg/RPMS/noarch/xCAT-server-$VER*rpm $DESTDIR
    mv /usr/src/$pkg/SRPMS/xCAT-server-$VER*rpm $SRCDIR
 fi
+if $GREP xCAT-rmc ../coresvnup; then
+   UPLOAD=1
+   ./makermcrpm
+   rm -f $DESTDIR/xCAT-rmc*rpm
+   rm -f $SRCDIR/xCAT-rmc*rpm
+   mv /usr/src/$pkg/RPMS/noarch/xCAT-rmc-$VER*rpm $DESTDIR
+   mv /usr/src/$pkg/SRPMS/xCAT-rmc-$VER*rpm $SRCDIR
+fi
 if $GREP xCAT-nbroot ../coresvnup; then
    UPLOAD=1
    ./makenbrootrpm x86_64
diff --git a/xCAT-web/lib/functions.php b/xCAT-web/lib/functions.php
index 59fa5df08..5f774599c 100644
--- a/xCAT-web/lib/functions.php
+++ b/xCAT-web/lib/functions.php
@@ -692,9 +692,10 @@ $HWTypeInfo = array (
 		  'p5-595' => array ( 'image'=>'590.gif', 'rackimage'=>'p5-590-front', 'u'=>42, 'aliases'=>'' ),  # 9119
 
 		# POWER 6 servers
-		  'p6-520' => array ( 'image'=>'520.gif', 'rackimage'=>'p5-520-front', 'u'=>4, 'aliases'=>'8203,520' ),
-		  'p6-550' => array ( 'image'=>'520.gif', 'rackimage'=>'p5-520-front', 'u'=>4, 'aliases'=>'8204,550' ),
-		  'p6-570' => array ( 'image'=>'520.gif', 'rackimage'=>'p5-520-front', 'u'=>4, 'aliases'=>'9117,570' ),
+		  'p6-520' => array ( 'image'=>'520.gif', 'rackimage'=>'p5-520-front', 'u'=>4, 'aliases'=>'8203,520,HV4' ),
+		  'p6-550' => array ( 'image'=>'520.gif', 'rackimage'=>'p5-520-front', 'u'=>4, 'aliases'=>'8204,550,HV8' ),
+		  'p6-560' => array ( 'image'=>'520.gif', 'rackimage'=>'p5-520-front', 'u'=>4, 'aliases'=>'8234,560,ML4+' ),
+		  'p6-570' => array ( 'image'=>'520.gif', 'rackimage'=>'p5-520-front', 'u'=>4, 'aliases'=>'9117,570,ML4,ML8,ML12,ML16' ),
 		  'p6-575' => array ( 'image'=>'342.gif', 'rackimage'=>'p6-575-front', 'u'=>2, 'aliases'=>'9125,575' ),
 		  'p6-595' => array ( 'image'=>'590.gif', 'rackimage'=>'p5-590-front', 'u'=>42, 'aliases'=>'9119,595' ),
 		 );