diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript
new file mode 100755
index 000000000..912283ae5
--- /dev/null
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Sample postbootscript script for installing and configuring HPC software
+# for statefull (full-disk install) nodes
+# Make sure this runs after the otherpkgs postbootscript
+#
+
+ps_dir=/xcatpost
+
+# Run script to install gpfs updates
+$ps_dir/gpfs_updates
+
+
+# Run script to accept compiler license
+$ps_dir/compilers_license
+
+
+# Run script to install PE and accept license
+$ps_dir/pe_install
+
+
+# Run script to install ESSL and PESSL rpms
+$ps_dir/essl_install
+
+
+# Run script to accept LoadLeveler license, install product rpms, 
+# and do some config
+$ps_dir/loadl_install
+
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postscript b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postscript
new file mode 100755
index 000000000..8d9eacc7d
--- /dev/null
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postscript
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Sample postscript script for base OS configuration for all HPC software
+# for statefull (full-disk install) nodes
+# Make sure this runs before the node reboots after initial install
+# for services to be activated
+#
+
+ps_dir=/xcatpost
+
+hpc=/opt/xcat/share/xcat/IBMhpc
+otherpkgs=/install/post/otherpkgs/$osver/$arch
+
+
+chkconfig atd on
+chkconfig xinetd on
+
+# Automatically mount /dev/cpuset at node boot
+if ! grep 'cpuset' /etc/init.d/boot.local ; then
+cat <<END >>/etc/init.d/boot.local
+if test -e /dev/cpuset || mkdir -p /dev/cpuset ; then
+        mount -t cpuset none /dev/cpuset
+fi
+END
+fi
+
+# Modify some ulimits
+if [ -f /etc/sysconfig/ulimit ]; then
+    if [ ! -f /etc/sysconfig/ulimit.XCAT_BAK ]; then
+       cp -p /etc/sysconfig/ulimit /etc/sysconfig/ulimit.XCAT_BAK
+    fi
+    # max locked memory
+    /usr/bin/sed -i 's/HARDLOCKLIMIT=.*/HARDLOCKLIMIT="unlimited"/g'  /etc/sysconfig/ulimit
+    /usr/bin/sed -i 's/SOFTLOCKLIMIT=.*/SOFTLOCKLIMIT="unlimited"/g'  /etc/sysconfig/ulimit
+    # max memory size
+    /usr/bin/sed -i 's/HARDRESIDENTLIMIT=.*/HARDRESIDENTLIMIT="unlimited"/g'  /etc/sysconfig/ulimit
+    /usr/bin/sed -i 's/SOFTRESIDENTLIMIT=.*/SOFTRESIDENTLIMIT="unlimited"/g'  /etc/sysconfig/ulimit
+fi
+
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist
index beccd4d4b..582bcec1d 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist
@@ -41,5 +41,3 @@ xorg-x11-libs-32bit
 xorg-x11-libX11
 xorg-x11-libXext
 
-#NEW_INSTALL_LIST#
-src
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
index 4c3e4b4b3..1a78fc57a 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
@@ -15,7 +15,7 @@ xlf_script=`find opt/ibmcmp/xlf -name new_install -print`
 
 
 if [ $OS != "AIX" ]; then
-    if [ $NODESETSTATE == "install" ]; then
+    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
     #  Being run from a stateful install postscript
        echo 1 | $vacpp_script
        echo 1 | $xlf_script
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
index 9033c49f7..3a50bebf9 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
@@ -20,14 +20,14 @@ fi
 
 
 if [ $OS != "AIX" ]; then
-    if [ $NODESETSTATE == "install" ]; then
+    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
     #  Being run from a stateful install postscript
     #  Copy rpms directly from the xCAT management node and install        
         mkdir -p /tmp/essl
         rm -f -R /tmp/essl/*
         cd /tmp/essl
         download_dir=`echo $ESSL_DIR | cut -d '/' -f3-`
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
+        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
         rpm -Uvh essl.license*.rpm
         install_essl=`find /opt/ibmmath/essl -name install_essl -print`
         $install_essl -y -d . -nodocs
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
index 8ba6021ff..4430af2ee 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
@@ -29,7 +29,7 @@ INSTALL_DIR='/install'
 UPDATES_DIR='post/otherpkgs/gpfs_updates'
 
 if [ $OS != "AIX" ]; then
-    if [ $NODESETSTATE == "install" ]; then
+    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
     #  Being run from a stateful install postscript
     #  Copy rpms directly from the xCAT management node and install        
         mkdir -p /tmp/gpfs_updates
@@ -37,7 +37,7 @@ if [ $OS != "AIX" ]; then
         cd /tmp/gpfs_updates
         wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$UPDATES_DIR/*.rpm 2> /tmp/wget.log
         rpm -Uvh *.rpm
-
+        rm -f -R /tmp/gpfs_updates
     fi
 
     if [ $NODESETSTATE == "genimage" ]; then
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
index 7ac6620c0..b4984b6ac 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
@@ -23,15 +23,15 @@ fi
 
 
 if [ $OS != "AIX" ]; then
-    if [ $NODESETSTATE == "install" ]; then
+    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
     #  Being run from a stateful install postscript
     #  Copy rpms directly from the xCAT management node and install
         mkdir -p /tmp/loadl
         rm -f -R /tmp/loadl/*
         cd /tmp/loadl
         download_dir=`echo $LOADL_DIR | cut -d '/' -f3-`
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
-        rpm -Uvh LoadL-resmgr-full-license*.rpm
+        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
+        rpm -Uvh LoadL-full-license*.rpm
         $linux_loadl_license_script -c resmgr -y -d .
         rm -Rf /tmp/loadl
         mkdir /dev/cpuset
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist
index 17fadeca7..e1fc33e57 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist
@@ -1,2 +1,3 @@
+pe/src
 pe/IBM_pe_license
 #  All PE packages are installed through the pe_install postinstall script
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
index dc3283171..6f7d6de0a 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
@@ -34,16 +34,17 @@ fi
 
 
 if [ $OS != "AIX" ]; then
-    if [ $NODESETSTATE == "install" ]; then
+    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
     #  Being run from a stateful install postscript
     #  Copy rpms directly from the xCAT management node and install
         mkdir -p /tmp/pe
         rm -f -R /tmp/pe/*
         cd /tmp/pe
         download_dir=`echo $PE_DIR | cut -d '/' -f3-`
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
+        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
         rpm -Uvh IBM_pe_license*.rpm
-        rpm -Uvh ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm *sci_*.rpm
+        IBM_PE_LICENSE_PROMPT=N /opt/ibmhpc/install/sbin/accept_ppe_license.sh
+        rpm -Uvh --force ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm 
         cd /
         rm -Rf /tmp/pe
     fi
@@ -64,7 +65,7 @@ if [ $OS != "AIX" ]; then
             mkdir -p $installroot/etc/opt/ibmhpc/license
             cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license
             # Install PE product rpms
-            zypper -R $installroot install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm $PE_DIR/*sci_*.rpm
+            zypper -R $installroot install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm 
         else
         # For Redhat, etc., assume yum is available on the system running genimage
             if [ ! -d /etc/opt/ibmhpc/license ] ; then
@@ -78,7 +79,7 @@ if [ $OS != "AIX" ]; then
             mkdir -p $installroot/etc/opt/ibmhpc/license
             cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license
             # Install PE product rpms
-            yum --installroot $installroot --nogpgcheck localupdate $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm $PE_DIR/*sci_*.rpm
+            yum --installroot $installroot --nogpgcheck localupdate $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm 
         fi
     fi
 fi
@@ -106,6 +107,8 @@ fi
 
 # POE requires rsh to be running
 /usr/bin/sed -i 's/disable.*/disable = no/g'  $installroot/etc/xinetd.d/rsh
-
+if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
+   service xinetd restart
+fi