diff --git a/xCAT-server/debian/control b/xCAT-server/debian/control
index d01c9713b..e4260364c 100644
--- a/xCAT-server/debian/control
+++ b/xCAT-server/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.7.2
 
 Package: xcat-server
 Architecture: all
-Depends: ${perl:Depends}, perl-xcat (>= 2.5.0-1), xcat-client (>= 2.5.0-1), libsys-syslog-perl, libio-socket-ssl-perl, libxml-simple-perl, make, libdbd-sqlite3-perl, libexpect-perl, libnet-dns-perl, libsoap-lite-perl, libxml-libxml-perl, libsnmp-perl
+Depends: ${perl:Depends}, perl-xcat (>= 2.5.0-1), xcat-client (>= 2.5.0-1), libsys-syslog-perl, libio-socket-ssl-perl, libxml-simple-perl, make, libdbd-sqlite3-perl, libexpect-perl, libnet-dns-perl, libsoap-lite-perl, libxml-libxml-perl, libsnmp-perl, debootstrap
 Description: Server and configuration utilities of the xCAT management project
  xCAT-server provides the core server and configuration management components of xCAT.  This package should be installed on your management server
diff --git a/xCAT-server/debian/dirs b/xCAT-server/debian/dirs
index a3aad892a..eafc743ed 100644
--- a/xCAT-server/debian/dirs
+++ b/xCAT-server/debian/dirs
@@ -4,6 +4,7 @@ opt/xcat/sbin
 opt/xcat/share
 opt/xcat/share/xcat
 opt/xcat/share/xcat/install
+opt/xcat/share/xcat/netboot
 opt/xcat/share/xcat/ca
 opt/xcat/share/xcat/scripts
 opt/xcat/share/xcat/tools
@@ -21,6 +22,10 @@ opt/xcat/lib/perl/xCAT
 opt/xcat/lib/perl/xCAT_plugin
 opt/xcat/lib/perl/xCAT_schema
 opt/xcat/lib/perl/xCAT_monitoring
-opt/xcat/dsh
+opt/xcat/lib/perl/xCAT_monitoring/samples
+opt/xcat/lib/perl/xCAT_monitoring/pcp
+opt/xcat/xdsh
+opt/xcat/xdsh/Context
 etc/init.d
 etc/xcat
+opt/xcat/share/doc/packages/xCAT-server
\ No newline at end of file
diff --git a/xCAT-server/debian/install b/xCAT-server/debian/install
index 4b132fbc1..0364adcee 100644
--- a/xCAT-server/debian/install
+++ b/xCAT-server/debian/install
@@ -1,6 +1,7 @@
 bin/* opt/xcat/bin/
 sbin/* opt/xcat/sbin/
 share/xcat/install/* opt/xcat/share/xcat/install/
+share/xcat/netboot/* opt/xcat/share/xcat/netboot/
 share/xcat/ca/* opt/xcat/share/xcat/ca
 
 share/xcat/scripts/* opt/xcat/share/xcat/scripts
@@ -12,12 +13,11 @@ share/xcat/cons/* opt/xcat/share/xcat/cons
 share/xcat/ib/scripts/* opt/xcat/share/xcat/ib/scripts
 share/xcat/ib/netboot/sles/* opt/xcat/share/xcat/ib/netboot/sles
 
-
 lib/perl/xCAT/* opt/xcat/lib/perl/xCAT/
 lib/xcat/plugins/* opt/xcat/lib/perl/xCAT_plugin/
 lib/xcat/schema/* opt/xcat/lib/perl/xCAT_schema/
 lib/xcat/monitoring/* opt/xcat/lib/perl/xCAT_monitoring/
-lib/xcat/dsh/Context opt/xcat/xdsh/ 
+lib/xcat/dsh/Context/* opt/xcat/xdsh/Context
 
 lib/xcat/shfunctions opt/xcat/lib
 etc/init.d/xcatd etc/init.d
diff --git a/xCAT-server/debian/postinst b/xCAT-server/debian/postinst
index 397dd8fd3..1c14637a0 100644
--- a/xCAT-server/debian/postinst
+++ b/xCAT-server/debian/postinst
@@ -20,9 +20,16 @@ set -e
 
 case "$1" in
     configure)
-        xcatconfig -i
-    	update-rc.d xcatd enable
-	/etc/init.d/xcatd reload
+	. /etc/profile.d/xcat.sh
+	xcatconfig -i -d
+	update-rc.d xcatd enable
+	if [ -f /tmp/xCAT-server_upgrade.tmp ]; then
+	    if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
+		/etc/init.d/xcatd reload
+	    fi
+	fi
+	ln -sf /opt/xcat/sbin/xcatd /usr/sbin/xcatd
+	
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/xCAT-server/debian/preinst b/xCAT-server/debian/preinst
new file mode 100644
index 000000000..139732e80
--- /dev/null
+++ b/xCAT-server/debian/preinst
@@ -0,0 +1,38 @@
+#!/bin/sh
+# preinst script for xCAT-server
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    upgrade)
+	touch /tmp/xCAT-server_upgrade.tmp
+    ;;
+    install)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/xCAT-server/debian/rules b/xCAT-server/debian/rules
index f5f701ae5..d052f1982 100644
--- a/xCAT-server/debian/rules
+++ b/xCAT-server/debian/rules
@@ -61,6 +61,7 @@ binary-arch:
 	chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_schema/*
 	chmod 755 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_schema/samples
 	chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_schema/samples/*
+	chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/shfunctions
 	chmod 644 `pwd`/debian/xcat-server/opt/xcat/share/doc/packages/xCAT-server/*
 #	dh_installmenu
 #	dh_installdebconf	
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist
index 62178a8da..15da4d211 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist
@@ -10,3 +10,4 @@ vim
 ntp
 rsyslog
 rsync
+busybox-static