diff --git a/buildcore.sh b/buildcore.sh
index 741225d95..6ee7bf62e 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -68,6 +68,7 @@ fi
 
 # These are the rpms that should be built for each kind of xcat build
 ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm"
+LENOVOBUILD="perl-xCAT xCAT-client xCAT-server xCAT xCATsn xCAT-genesis-scripts xCAT-vlan xCAT-probe"
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
 # xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat
@@ -141,6 +142,8 @@ if [ -n "$EMBED" ]; then
     elif [ "$EMBED" = "fsm" ]; then
         EMBEDBUILD=$FSMBUILD
         EMBEDLINK=$FSMLINK
+    elif [ "$EMBED" = "lenovo" ]; then
+        EMBEDBUILD=$LENOVOBUILD
     else
         echo "Error: EMBED setting $EMBED not recognized."
         exit 2
diff --git a/makerpm b/makerpm
index c80ed0edf..8c52e73f9 100755
--- a/makerpm
+++ b/makerpm
@@ -202,6 +202,8 @@ function makegenesisscripts {
 function exportEmbed {
 	if [ -n "$1" ]; then
 		export "$1=1"
+		echo export "$1=1"
+                echo $lenovo
 		EMBEDTXT="for $1 "
 	else
 		EMBEDTXT=""
diff --git a/perl-xCAT/perl-xCAT.spec b/perl-xCAT/perl-xCAT.spec
index b1bb44274..d0f00a4f8 100644
--- a/perl-xCAT/perl-xCAT.spec
+++ b/perl-xCAT/perl-xCAT.spec
@@ -70,8 +70,6 @@ chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/data/*
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/hpoa.pm
 %endif
 
-# Don't ship these on zVM, to reduce dependencies
-%if %zvm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/hpoa.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/vboxService.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/FSP*.pm
@@ -79,7 +77,6 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC*.pm
 # have to put PPCdb.pm back because it is needed by Postage.pm
 cp xCAT/PPCdb.pm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/
 chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPCdb.pm
-%endif
 # Don't ship these on FSM, to reduce dependencies
 %if %fsm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/hpoa.pm
diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 7ff063a48..ff11a2cf9 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -50,7 +50,6 @@ use Time::HiRes qw(gettimeofday sleep);
 use xCAT::DBobjUtils;
 use Getopt::Long;
 use xCAT::SvrUtils;
-use xCAT::FSPUtils;
 my $indiscover  = 0;
 my $CALLBACK    = undef;
 my $verbose_cmd = undef;
@@ -5165,28 +5164,6 @@ sub get_blades_for_mpa {
         }
         $nodesattrs = $ppctab->getNodesAttribs(\@blades, \@attribs);
     }
-    foreach my $node (@blades) {
-        my @values = ();
-        my $att    = $nodesattrs->{$node}->[0];
-        if (!defined($att)) {
-            next;
-        } elsif (!defined($att->{parent}) or ($att->{parent} ne $mpa) or !defined($att->{nodetype}) or ($att->{nodetype} ne "blade")) {
-            next;
-        }
-        my $request;
-        my $hcp_ip = xCAT::FSPUtils::getIPaddress($request, $att->{nodetype}, $att->{hcp});
-        if (!defined($hcp_ip) or ($hcp_ip == -3)) {
-            next;
-        }
-        push @values, $att->{id};
-        push @values, '0';
-        push @values, '0';
-        push @values, $hcp_ip;
-        push @values, "blade";
-        push @values, $mpa;
-        $blades_hash{$node} = \@values;
-        verbose_message("values for node:$node, value:@values.");
-    }
     return (\%blades_hash);
 }
 
diff --git a/xCAT-server/lib/xcat/plugins/energy.pm b/xCAT-server/lib/xcat/plugins/energy.pm
index 916cf0263..69ca92d33 100644
--- a/xCAT-server/lib/xcat/plugins/energy.pm
+++ b/xCAT-server/lib/xcat/plugins/energy.pm
@@ -29,7 +29,6 @@ use xCAT::Usage;
 use xCAT::CIMUtils;
 use xCAT::MsgUtils;
 use xCAT::Table;
-use xCAT::FSPUtils;
 use xCAT::NetworkUtils;
 
 sub handled_commands {
diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index a3670db9d..366f78e82 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -21,6 +21,9 @@ AutoReqProv: no
 %define pcm %(if [ "$pcm" = "1" ];then echo 1; else echo 0; fi)
 %define notpcm %(if [ "$pcm" = "1" ];then echo 0; else echo 1; fi)
 
+%define lenovo 1
+%define notlenovo 0
+
 # AIX will build with an arch of "ppc"
 # also need to fix Requires for AIX
 %ifos linux
@@ -31,12 +34,14 @@ Obsoletes: atftp-xcat
 
 # The aix rpm cmd forces us to do this outside of ifos type stmts
 %if %notpcm
+%if %notlenovo
 %ifos linux
 # PCM does not use or ship grub2-xcat
 Requires: grub2-xcat perl-Net-HTTPS-NB perl-HTTP-Async
 #%endif
 %endif
 %endif
+%endif
 
 %if %fsm
 # nothing needed here
@@ -199,31 +204,35 @@ chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/*
 chmod 755 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples
 chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples/*
 
-# Don't ship these on zVM, to reduce dependencies
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/fsp.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hmc.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ivm.pm
+rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/hmc
+rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/ivm
+rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/multiple
+rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/fsp
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bpa.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpblade.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/vbox.pm
 %if %zvm
 rm $RPM_BUILD_ROOT/%{prefix}/sbin/stopstartxcatd
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/activedirectory.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/blade.pm
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpblade.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpilo.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/nodediscover.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/switch.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xen.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/kvm.pm
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/vbox.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/aixinstall.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/slpdiscover.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/remoteimmsetup.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/IMMUtils.pm
 #rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/RShellAPI.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bmcconfig.pm
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bpa.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/esx.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/FIP.pm
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/fsp.pm
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hmc.pm
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ivm.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/lsslp.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/pxe.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/toolscenter.pm
@@ -234,7 +243,6 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xnba.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/IPMI.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/SSHInteract.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/MellanoxIB.pm
-rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm
 # Can not remove this, because it is needed by Templates.pm
 #rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/ADUtils.pm
 rm $RPM_BUILD_ROOT/%{prefix}/share/xcat/cons/hmc
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 2c6023948..85d437654 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -25,7 +25,7 @@ Source7: xcat.conf.apach24
 
 Provides: xCAT = %{version}
 Conflicts: xCATsn
-Requires: xCAT-server xCAT-client perl-DBD-SQLite xCAT-probe >= 2.12.1 xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64
+Requires: xCAT-server xCAT-client perl-DBD-SQLite xCAT-probe >= 2.12.1 xCAT-genesis-scripts-x86_64
 
 %define pcm %(if [ "$pcm" = "1" ];then echo 1; else echo 0; fi)
 %define notpcm %(if [ "$pcm" = "1" ];then echo 0; else echo 1; fi)
@@ -41,11 +41,6 @@ Requires: /usr/sbin/dhcpd
 Requires: /usr/bin/ssh
 %ifnarch s390x
 Requires: /etc/xinetd.d/tftp
-Requires: xCAT-buildkit
-# yaboot-xcat is pulled in so any MN can manage ppc nodes
-#Requires: yaboot-xcat
-# Stty is only needed for rcons on ppc64 nodes, but for mixed clusters require it on both x and p
-Requires: perl-IO-Stty
 %endif
 %endif
 
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index ed793aee6..847a9ea69 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -17,7 +17,7 @@ Source3: xCATSN
 Source5: templates.tar.gz
 Source6: xcat.conf.apach24
 Provides: xCATsn = %{version}
-Requires: xCAT-server xCAT-client perl-DBD-SQLite xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64 xCAT-probe >= 2.12.2 
+Requires: xCAT-server xCAT-client perl-DBD-SQLite xCAT-genesis-scripts-x86_64 xCAT-probe >= 2.12.2 
 
 Conflicts: xCAT
 
@@ -40,7 +40,6 @@ Requires: /etc/xinetd.d/tftp
 # yaboot-xcat is pulled in so any MN can manage ppc nodes
 #Requires: yaboot-xcat 
 # Stty is only needed for rcons on ppc64 nodes, but for mixed clusters require it on both x and p
-Requires: perl-IO-Stty
 %endif
 %endif