diff --git a/buildcore.sh b/buildcore.sh
index 400eb4620..f575c3c9c 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -67,7 +67,7 @@ if [ -z "$UP" ]; then
 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"
+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"
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
 # xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat
@@ -299,7 +299,7 @@ if [ "$OSNAME" = "AIX" ]; then
 fi
 
 # Build the rest of the noarch rpms
-for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe; do
+for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm; do
     if [[ " $EMBEDBUILD " != *\ $rpmname\ * ]]; then continue; fi
     if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi  # do not build xCAT-buildkit on aix
     if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-SoftLayer" ]; then continue; fi # do not build xCAT-softlayer on aix
diff --git a/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist b/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..a187e38a2
--- /dev/null
+++ b/xCAT-csm/csm.compute.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm compute
diff --git a/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist b/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..f24861fbb
--- /dev/null
+++ b/xCAT-csm/csm.launch.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm launch
diff --git a/xCAT-csm/csm.login.rhels7.ppc64le.pkglist b/xCAT-csm/csm.login.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..4410939e0
--- /dev/null
+++ b/xCAT-csm/csm.login.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm login
diff --git a/xCAT-csm/csm.service.rhels7.ppc64le.pkglist b/xCAT-csm/csm.service.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..932d448df
--- /dev/null
+++ b/xCAT-csm/csm.service.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm service
diff --git a/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist b/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist
new file mode 100644
index 000000000..80ea18046
--- /dev/null
+++ b/xCAT-csm/csm.workloadmanager.rhels7.ppc64le.pkglist
@@ -0,0 +1 @@
+#csm workload manager
diff --git a/xCAT-csm/install/postscripts/csm_post b/xCAT-csm/install/postscripts/csm_post
new file mode 100644
index 000000000..bfad0d20e
--- /dev/null
+++ b/xCAT-csm/install/postscripts/csm_post
@@ -0,0 +1 @@
+#example postscript for CSM
diff --git a/xCAT-csm/xCAT-csm.spec b/xCAT-csm/xCAT-csm.spec
new file mode 100644
index 000000000..23c1a9b92
--- /dev/null
+++ b/xCAT-csm/xCAT-csm.spec
@@ -0,0 +1,53 @@
+Summary: Packages for installation of CSM nodes
+Name: xCAT-csm
+Version: %{?version:%{version}}%{!?version:%(cat Version)}
+Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
+Epoch: 4
+License: IBM
+Group: Applications/System
+Source: xCAT-csm-%{version}.tar.gz
+Packager: IBM Corp.
+Vendor: IBM Corp.
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+Prefix: /opt/xcat
+BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
+
+%ifos linux
+BuildArch: noarch
+%endif
+
+Provides: xCAT-csm = %{epoch}:%{version}
+
+Requires: xCAT
+
+%description
+xCAT-csm provides Packages for installation of CSM nodes
+
+%prep
+%setup -q -n xCAT-csm
+
+
+%build
+
+%install
+rm -rf %{buildroot}
+
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/
+mkdir -p $RPM_BUILD_ROOT/install/postscripts/csm/
+
+cp csm* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/rh/
+cp install/postscripts/* $RPM_BUILD_ROOT/install/postscripts/csm/
+
+%clean
+# This step does not happen until *after* the %files packaging below
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{prefix}
+/install/postscripts
+%doc
+
+
+
+%changelog