diff --git a/xCAT/postscripts/getcredentials.awk b/xCAT/postscripts/getcredentials.awk
index 781dfc659..28d149bbf 100755
--- a/xCAT/postscripts/getcredentials.awk
+++ b/xCAT/postscripts/getcredentials.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 BEGIN {
-        if (ENVIRON["USEOPENSSLFORXCAT"]) {
+        if ((ENVIRON["USEOPENSSLFORXCAT"]) || (ENVIRON["AIX"])) {
             server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
         } else {
             server = "/inet/tcp/0/127.0.0.1/400"
diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index 8ed60a1a3..2e09ce79b 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -44,7 +44,11 @@ fi
 allowcred.awk &
 CREDPID=$!
 sleep 1
-
+if [ "$(uname -s)" = "AIX" ]; then
+ AIX=1
+ export AIX 
+  logger -t xcat "remoteshell setting up AIX"
+fi
 
 getcredentials.awk ssh_dsa_hostkey | grep -E -v '</{0,1}xcatresponse>|</{0,1}serverdone>' | sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /tmp/ssh_dsa_hostkey