diff --git a/xCAT-server-2.0/share/xcat/install/scripts/post.rh b/xCAT-server-2.0/share/xcat/install/scripts/post.rh
index be0c37d36..806e358a5 100644
--- a/xCAT-server-2.0/share/xcat/install/scripts/post.rh
+++ b/xCAT-server-2.0/share/xcat/install/scripts/post.rh
@@ -38,7 +38,7 @@ do
 		#wget --wait=10 --random-wait --waitretry=10 --retry-connrefused -t 0 -T 60 http://$i/install/autoinst/xcatpost.tar.gz
 		if [ "$?" = "0" ]
 		then
-         if [ -x /usr/sbin/stunnel ]; then #Stop if no stunnel to help the next bit
+         if [ -x /usr/sbin/stunnel -o -x /usr/bin/stunnel ]; then #Stop if no stunnel to help the next bit
             echo client=yes > /etc/stunnel/stunnel.conf
             echo foreground=yes >> /etc/stunnel/stunnel.conf
             echo output=/dev/null >> /etc/stunnel/stunnel.conf
diff --git a/xCAT-server-2.0/share/xcat/install/scripts/post.rh.iscsi b/xCAT-server-2.0/share/xcat/install/scripts/post.rh.iscsi
index 0bbbc691f..385d98a8e 100644
--- a/xCAT-server-2.0/share/xcat/install/scripts/post.rh.iscsi
+++ b/xCAT-server-2.0/share/xcat/install/scripts/post.rh.iscsi
@@ -38,7 +38,7 @@ do
 		#wget --wait=10 --random-wait --waitretry=10 --retry-connrefused -t 0 -T 60 http://$i/install/autoinst/xcatpost.tar.gz
 		if [ "$?" = "0" ]
 		then
-         if [ -x /usr/sbin/stunnel ]; then #Stop if no stunnel to help the next bit
+         if [ -x /usr/sbin/stunnel -o -x /usr/bin/stunnel ]; then #Stop if no stunnel to help the next bit
             echo client=yes > /etc/stunnel/stunnel.conf
             echo foreground=yes >> /etc/stunnel/stunnel.conf
             echo output=/dev/null >> /etc/stunnel/stunnel.conf
diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index 9d7b88c0f..1167df0a3 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -36,7 +36,7 @@ fi
 #	logger -t xcat "Install: using server provided host key for convenience."
 #	cp /xcatpost/hostkeys/*_key /etc/ssh/
 #fi
-if [ ! -x /usr/sbin/stunnel ]; then #Stop if no stunnel to help the next bit
+if [ ! -x /usr/sbin/stunnel -a ! -x /usr/bin/stunnel ]; then #Stop if no stunnel to help the next bit
    exit 0
 fi
 allowcred.awk &