diff --git a/xCAT/postscripts/xcatclient b/xCAT/postscripts/xcatclient
new file mode 100644
index 000000000..5b829593e
--- /dev/null
+++ b/xCAT/postscripts/xcatclient
@@ -0,0 +1,16 @@
+#!/bin/sh
+# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+#egan@us.ibm.com
+#(C)IBM Corp
+#
+
+if [ ! -x /usr/sbin/stunnel ]; then #Stop if no stunnel to help the next bit
+   exit 0
+   fi
+   allowcred.awk &
+   CREDPID=$!
+   sleep 1
+   mkdir -p /root/.xcat
+   chmod 700 /root/.xcat
+   getcredentials.awk xcat_client_cred | grep -v '<'|sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /root/.xcat/client-cred.pem
+   chmod 600 /root/.xcat/client-cred.pem
diff --git a/xCAT/postscripts/xcatserver b/xCAT/postscripts/xcatserver
new file mode 100644
index 000000000..e1c3500a7
--- /dev/null
+++ b/xCAT/postscripts/xcatserver
@@ -0,0 +1,17 @@
+#!/bin/sh
+# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+#egan@us.ibm.com
+#(C)IBM Corp
+#
+
+if [ ! -x /usr/sbin/stunnel ]; then #Stop if no stunnel to help the next bit
+   exit 0
+   fi
+   allowcred.awk &
+   CREDPID=$!
+   sleep 1
+   mkdir -p /etc/xcat/cert
+   getcredentials.awk xcat_server_cred | grep -v '<'|sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /etc/xcat/cert/server-cred.pm
+   chmod 600 /etc/xcat/cert/*
+   getcredentials.awk xcat_cfgloc | grep -v '<'|sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /etc/xcat/cfgloc
+   chmod 600 /etc/xcat/cfgloc