diff --git a/build-debs-all b/build-debs-all
index ddebc60cf..ba8b83f0c 100755
--- a/build-debs-all
+++ b/build-debs-all
@@ -68,7 +68,6 @@ function makedeb {
 
 # build all debian packages
 makedeb xCAT-client $PKG_LOCATION "$BUILD_STRING" $VERSION
-makedeb xCAT-nbroot $PKG_LOCATION "$BUILD_STRING" $VERSION
 makedeb perl-xCAT $PKG_LOCATION "$BUILD_STRING" $VERSION
 makedeb xCAT-server $PKG_LOCATION "$BUILD_STRING" $VERSION
 makedeb xCAT-UI $PKG_LOCATION "$BUILD_STRING" $VERSION
diff --git a/buildcore.sh b/buildcore.sh
index 4a50d2b96..55ba66533 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -213,23 +213,6 @@ for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test; d
 	fi
 done
 
-if [ "$OSNAME" != "AIX" -a "$EMBED" != "zvm" ]; then
-	if grep -v nbroot2 $GITUP|$GREP xCAT-nbroot || [ "$BUILDALL" == 1 ]; then
-		UPLOAD=1
-		ORIGFAILEDRPMS="$FAILEDRPMS"
-		for arch in x86_64 x86 ppc64; do
-			./makerpm xCAT-nbroot-core $arch
-			if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS xCAT-nbroot-core-$arch"; fi
-		done
-		if [ "$FAILEDRPMS" = "$ORIGFAILEDRPMS" ]; then	# all succeeded
-			rm -f $DESTDIR/xCAT-nbroot-core*rpm
-			rm -f $SRCDIR/xCAT-nbroot-core*rpm
-			mv $source/RPMS/noarch/xCAT-nbroot-core-*rpm $DESTDIR
-			mv $source/SRPMS/xCAT-nbroot-core-*rpm $SRCDIR
-		fi
-	fi
-fi
-
 # Build the xCAT and xCATsn rpms for all platforms
 for rpmname in xCAT xCATsn; do
 	if [ "$EMBED" = "zvm" ]; then break; fi
diff --git a/comps.xml b/comps.xml
index aca2d952a..14be1493a 100644
--- a/comps.xml
+++ b/comps.xml
@@ -10,9 +10,6 @@
         <packagereq type="required">xCAT-server</packagereq>
         <packagereq type="required">xCAT-client</packagereq>
         <packagereq type="required">perl-xCAT</packagereq>
-        <packagereq type="required">xCAT-nbroot-core-x86_64</packagereq>
-        <packagereq type="required">xCAT-nbroot-core-x86</packagereq>
-        <packagereq type="optional">xCAT-nbroot-core-ppc64</packagereq>
     </packagelist>
 </group>
 </comps>
diff --git a/xCATsn/debian/control b/xCATsn/debian/control
index ff33a59f5..2885bd538 100644
--- a/xCATsn/debian/control
+++ b/xCATsn/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.7.2
 
 Package: xcatsn
 Architecture: all
-Depends: ${perl:Depends}, xcat-server (>= 2.5.0), perl-xcat (>= 2.5.0), xcat-client (>= 2.5.0), libdbd-sqlite3-perl, libxml-parser-perl, atftp-xcat, conserver, yaboot-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, fping, bind9, vsftpd, ipmitool (>=1.8.9), xnba-undi, syslinux-xcat, xcat-nbroot-oss-x86, xcat-nbroot-core-x86, xcat-nbkernel-x86, xcat-nbroot-oss-amd64, xcat-nbroot-core-amd64, xcat-nbkernel-amd64, xcat-nbroot-oss-ppc64, xcat-nbroot-core-ppc64, xcat-nbkernel-ppc64, syslinux
+Depends: ${perl:Depends}, xcat-server (>= 2.5.0), perl-xcat (>= 2.5.0), xcat-client (>= 2.5.0), libdbd-sqlite3-perl, libxml-parser-perl, atftp-xcat, conserver, yaboot-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, fping, bind9, vsftpd, ipmitool (>=1.8.9), xnba-undi, syslinux-xcat, syslinux
 Description: Metapackage for a common, default xCAT service node setup
  xCATsn is a service node management package intended for at-scale management, including hardware management and software management.
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 80a7b3018..e17ec7f30 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -38,9 +38,8 @@ Requires: perl-IO-Stty
 %endif
 
 %ifarch i386 i586 i686 x86 x86_64
-# All versions of the nb rpms are pulled in so an x86 MN can manage nodes of any arch.
-# The nb rpms are used for dhcp-based discovery, and flashing, so for now we do not need them on a ppc MN.
-Requires: xCAT-nbroot-oss-x86 xCAT-nbroot-core-x86 xCAT-nbkernel-x86 xCAT-nbroot-oss-x86_64 xCAT-nbroot-core-x86_64 xCAT-nbkernel-x86_64 xCAT-nbroot-oss-ppc64 xCAT-nbroot-core-ppc64 xCAT-nbkernel-ppc64 syslinux
+# The xCAT-genesis-x86_64 rpm is used for dhcp-based discovery, and flashing, so for now we do not need it on a ppc MN.
+Requires: syslinux xCAT-genesis-x86_64
 Requires: ipmitool-xcat >= 1.8.9
 Requires: xnba-undi syslinux-xcat
 %endif