diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index 7a923e5fd..489b2acb5 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -71,6 +71,11 @@ if ! grep "PRIVATE KEY" /etc/ssh/ssh_host_rsa_key > /dev/null 2>&1 ; then
 fi
 
 
+if [ -r /etc/xCATSN ] ; then
+   mkdir /etc/xcat/hostkeys
+   cp /etc/ssh/ssh* /etc/xcat/hostkeys/.
+
+fi
 
 
 umask 0077