diff --git a/mkAIXsnap b/mkAIXsnap
index 3f51f2b4a..a3e92e925 100755
--- a/mkAIXsnap
+++ b/mkAIXsnap
@@ -44,8 +44,8 @@ fi
 #
 # do an update from the trunk directory level
 #
-#svn update | tee $BLDTOP/coresvnup
-svn update
+svn update | tee $BLDTOP/coresvnup
+#svn update
 
 # create a simple install script
 echo "# xCAT on AIX - install script" > $RPMDIR/instxcat
@@ -84,6 +84,12 @@ chmod +x ./instxcat
 echo "instxcat" > ./flist
 ls *.rpm >> ./flist
 
+# add the service node bundle files to the tar file
+cp $BLDTOP/xCATaixSN.bnd $RPMDIR
+cp $BLDTOP/xCATaixSSH.bnd $RPMDIR 
+echo "xCATaixSN.bnd" >> ./flist
+echo "xCATaixSSH.bnd" >> ./flist
+
 #TIME=`date +%Y%m%d%H%M`
 tar -cvf core-aix-snap.tar -L flist
 gzip core-aix-snap.tar
diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec
index 9d99d3290..e39175779 100644
--- a/xCAT-client/xCAT-client.spec
+++ b/xCAT-client/xCAT-client.spec
@@ -143,11 +143,12 @@ ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/moncfg
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/mondecfg
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/monadd
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/monrm
-ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/mkdsklsnode
-ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/rmdsklsnode
-ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/mknimimage
-ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/rmnimimage
-ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/nimnodeset
+ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/mkdsklsnode
+ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/rmdsklsnode
+ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/mknimimage
+ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/rmnimimage
+ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/nimnodeset
+ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/nimnodecust
 ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/mkdef
 ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/chdef
 ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/lsdef
diff --git a/xCATaixSN.bnd b/xCATaixSN.bnd
index 5c8a01e83..8e37a82d5 100644
--- a/xCATaixSN.bnd
+++ b/xCATaixSN.bnd
@@ -3,11 +3,6 @@
 # installp packages
 I:openssl.base
 I:openssl.license
-I:openssh.base
-I:openssh.license
-I:openssh.man.en_US
-I:openssh.msg.en_US
-I:openssh.msg.EN_US
 I:bos.sysmgt.nim.master
 
 # RPMs
diff --git a/xCATaixSSH.bnd b/xCATaixSSH.bnd
new file mode 100644
index 000000000..9c846d24d
--- /dev/null
+++ b/xCATaixSSH.bnd
@@ -0,0 +1,5 @@
+I:openssh.base
+I:openssh.license
+I:openssh.man.en_US
+I:openssh.msg.en_US
+I:openssh.msg.EN_US