diff --git a/xCAT-client-2.0/share/doc/xCAT2.0RR.odt b/xCAT-client-2.0/share/doc/xCAT2.0RR.odt
index 842cf11eb..f47da7751 100644
Binary files a/xCAT-client-2.0/share/doc/xCAT2.0RR.odt and b/xCAT-client-2.0/share/doc/xCAT2.0RR.odt differ
diff --git a/xCAT-client-2.0/share/doc/xCAT2.0RR.pdf b/xCAT-client-2.0/share/doc/xCAT2.0RR.pdf
index dcd9c4456..2007e36c1 100644
Binary files a/xCAT-client-2.0/share/doc/xCAT2.0RR.pdf and b/xCAT-client-2.0/share/doc/xCAT2.0RR.pdf differ
diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl
index a0f31d274..143395e94 100644
--- a/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl
+++ b/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl
@@ -35,7 +35,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 
 #RAID 0 /scr for performance
@@ -119,7 +119,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -127,7 +127,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
@@ -166,6 +166,7 @@ sendmail-cf
 gdb
 binutils
 openssh-server
+vsftpd
 %pre
 #INCLUDE:../scripts/pre.rh#
 %post
diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist b/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist
index 9e2579ffa..5535b6a89 100644
--- a/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist
+++ b/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist
@@ -1,8 +1,8 @@
-bash 
+bash
 stunnel
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 vi
@@ -17,3 +17,4 @@ bzip2
 rootfiles
 vixie-cron
 wget
+vsftpd
diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index 67719a7eb..fa11955ec 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -26,7 +26,7 @@ then
 	cd /xcatpost/_ssh
 	mkdir -p /root/.ssh
 	cp -f * /root/.ssh
-   cd -
+   cd - >/dev/null
 	chmod 700 /root/.ssh
 	chmod 600 /root/.ssh/*
 fi