diff --git a/xCAT-client/debian/control.template b/xCAT-client/debian/control.template
deleted file mode 100644
index f4ba9b79c..000000000
--- a/xCAT-client/debian/control.template
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: xcat-client
-Section: admin
-Priority: extra
-Maintainer: Isaac Freeman <ifreeman@us.ibm.com>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
-
-Package: xcat-client
-Architecture: any
-Depends: ${perl:Depends}, perl-xcat, ###debian-depends###
-Description: Core executables and data of the xCAT management project
- xCAT-client provides the fundamental xCAT commands (chtab, chnode, rpower, etc) helpful in administrating systems at scale, with particular attention paid to large HPC clusters.
diff --git a/xCAT-client/debian/dirs b/xCAT-client/debian/dirs
index 55b162077..811caec27 100644
--- a/xCAT-client/debian/dirs
+++ b/xCAT-client/debian/dirs
@@ -1,7 +1,15 @@
 opt/xcat/bin
 opt/xcat/sbin
+opt/xcat/share/xcat/scripts
+opt/xcat/share/xcat/tools
 opt/xcat/share/man/man1
 opt/xcat/share/man/man3
 opt/xcat/share/man/man5
 opt/xcat/share/man/man8
+opt/xcat/share/doc/packages/xCAT-client
+opt/xcat/share/doc/man1
+opt/xcat/share/doc/man3
+opt/xcat/share/doc/man5
+opt/xcat/share/doc/man8
 opt/xcat/share/doc
+opt/xcat/share/xcat/rvid
diff --git a/xCAT-client/debian/files b/xCAT-client/debian/files
deleted file mode 100644
index d2329288f..000000000
--- a/xCAT-client/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-xcat-client_2.5.0-1_all.deb admin extra
diff --git a/xCAT-client/debian/postinst b/xCAT-client/debian/postinst
new file mode 100644
index 000000000..26055fc43
--- /dev/null
+++ b/xCAT-client/debian/postinst
@@ -0,0 +1,46 @@
+#!/bin/sh
+# postinst script for xcat-client
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+
+        cat << EOF > /etc/profile.d/xcat.sh
+XCATROOT=/opt/xcat
+PATH=\$PATH:\$XCATROOT/bin:\$XCATROOT/sbin
+MANPATH=\$MANPATH:\$XCATROOT/share/man:
+export XCATROOT PATH MANPATH
+export PERL_BADLANG=0
+EOF
+
+chmod 755 /etc/profile.d/xcat.*
+
+exit 0
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+exit 0
diff --git a/xCAT-client/debian/postrm b/xCAT-client/debian/postrm
new file mode 100644
index 000000000..224d603dd
--- /dev/null
+++ b/xCAT-client/debian/postrm
@@ -0,0 +1,43 @@
+#!/bin/sh
+# postrm script for xcat-client
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+    
+    remove)
+       if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
+             rm /etc/profile.d/xcat.*
+       fi
+    ;;
+
+    *)
+        echo "postrm 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-client/debian/rules b/xCAT-client/debian/rules
new file mode 100755
index 000000000..6a1ca1d16
--- /dev/null
+++ b/xCAT-client/debian/rules
@@ -0,0 +1,83 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DH_COMPAT=5
+
+
+build:
+	pwd
+	./xpod2man
+
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+
+install:
+	pwd
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	dh_install
+	dh_link
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch:
+	pwd
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+#	dh_installexamples
+	dh_install
+	chmod 755 `pwd`/debian/xcat-client/opt/xcat/share/xcat/rvid/*
+	chmod 755 `pwd`/debian/xcat-client/opt/xcat/bin/*
+	chmod 755 `pwd`/debian/xcat-client/opt/xcat/sbin/*
+	chmod 444 `pwd`/debian/xcat-client/opt/xcat/share/man/man1/*
+	chmod 444 `pwd`/debian/xcat-client/opt/xcat/share/man/man3/*
+	chmod 444 `pwd`/debian/xcat-client/opt/xcat/share/man/man5/*
+	chmod 444 `pwd`/debian/xcat-client/opt/xcat/share/man/man8/*
+	chmod 755 `pwd`/debian/xcat-client/opt/xcat/share/doc/*
+	chmod 644 `pwd`/debian/xcat-client/opt/xcat/share/doc/man1/*
+	chmod 644 `pwd`/debian/xcat-client/opt/xcat/share/doc/man3/*
+	chmod 644 `pwd`/debian/xcat-client/opt/xcat/share/doc/man5/*
+	chmod 644 `pwd`/debian/xcat-client/opt/xcat/share/doc/man8/*
+	chmod 644 `pwd`/debian/xcat-client/opt/xcat/share/doc/packages/xCAT-client/*
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+#	dh_link
+#	dh_strip
+	dh_compress
+#	dh_fixperms
+	dh_perl
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/xCAT-client/debian/xcat-client.install b/xCAT-client/debian/xcat-client.install
index e3aa40145..3c0e89e44 100644
--- a/xCAT-client/debian/xcat-client.install
+++ b/xCAT-client/debian/xcat-client.install
@@ -1,3 +1,4 @@
-bin/* usr/bin/
-sbin/* usr/sbin/
-share/* usr/share/
+bin/* opt/xcat/bin/
+sbin/* opt/xcat/sbin/
+share/* opt/xcat/share/
+LICENSE.html opt/xcat/share/doc/packages/xCAT-client
diff --git a/xCAT-client/debian/xcat-client.links b/xCAT-client/debian/xcat-client.links
index 90c028b52..1698d275f 100644
--- a/xCAT-client/debian/xcat-client.links
+++ b/xCAT-client/debian/xcat-client.links
@@ -1,48 +1,89 @@
-usr/bin/xcatclient usr/bin/rpower
-usr/bin/xcatclient usr/bin/rscan
-usr/bin/xcatclient usr/sbin/makedhcp
-usr/bin/xcatclient usr/sbin/makehosts
-usr/bin/xcatclient usr/sbin/nodeset
-usr/bin/xcatclient usr/sbin/setupiscsidev
-usr/bin/xcatclient usr/sbin/makeconservercf
-usr/bin/xcatclient usr/bin/rbeacon
-usr/bin/xcatclient usr/bin/rvitals
-usr/bin/xcatclient usr/bin/nodestat
-usr/bin/xcatclient usr/bin/rinv
-usr/bin/xcatclient usr/bin/rspreset
-usr/bin/xcatclient usr/bin/rsetboot
-usr/bin/xcatclient usr/bin/rbootseq
-usr/bin/xcatclient usr/bin/reventlog
-usr/bin/xcatclient usr/bin/nodels
-usr/bin/xcatclient usr/bin/nodech
-usr/bin/xcatclient usr/bin/noderm
-usr/bin/xcatclient usr/bin/rnetboot
-usr/bin/xcatclient usr/bin/getmacs
-usr/bin/xcatclient usr/bin/mkvm
-usr/bin/xcatclient usr/bin/rmvm
-usr/bin/xcatclient usr/bin/lsvm
-usr/bin/xcatclient usr/bin/chvm
-usr/bin/xcatclient usr/bin/tabgrep
-usr/bin/xcatclientnnr usr/bin/lsslp
-usr/bin/xcatclientnnr usr/sbin/tabdump
-usr/bin/xcatclientnnr usr/sbin/packimage
-usr/bin/xcatclientnnr usr/sbin/makedns
-usr/bin/xcatclientnnr usr/bin/gettab
-usr/bin/xcatclientnnr usr/sbin/nodeadd
-usr/bin/xcatclientnnr usr/sbin/makenetworks
-usr/bin/xcatclientnnr usr/sbin/copycds
-usr/bin/xcatclientnnr usr/bin/regnotif
-usr/bin/xcatclientnnr usr/bin/unregnotif
-usr/bin/xcatclientnnr usr/bin/monstart
-usr/bin/xcatclientnnr usr/bin/monstop
-usr/bin/xcatclientnnr usr/bin/monls
-usr/bin/xcatclientnnr usr/sbin/monupdate
-usr/bin/xcatclientnnr usr/sbin/monaddnode
-usr/bin/xcatclientnnr usr/sbin/monrmnode
-usr/bin/xcatclientnnr usr/bin/mkdsklsnode
-usr/bin/xcatclientnnr usr/bin/mkdsklsimage
-usr/bin/xcatDBcmds usr/bin/mkdef
-usr/bin/xcatDBcmds usr/bin/chdef
-usr/bin/xcatDBcmds usr/bin/lsdef
-usr/bin/xcatDBcmds usr/bin/rmdef
-usr/bin/xcatDBcmds usr/bin/xcat2nim
+opt/xcat/bin/xcatclient opt/xcat/bin/rpower
+opt/xcat/bin/xcatclient opt/xcat/bin/rscan
+opt/xcat/bin/xcatclient opt/xcat/sbin/makedhcp
+opt/xcat/bin/xcatclient opt/xcat/sbin/makehosts
+opt/xcat/bin/xcatclient opt/xcat/sbin/makeknownhosts
+opt/xcat/bin/xcatclient opt/xcat/sbin/nodeset
+opt/xcat/bin/xcatclient opt/xcat/sbin/setupiscsidev
+opt/xcat/bin/xcatclient opt/xcat/sbin/makeconservercf
+opt/xcat/bin/xcatclient opt/xcat/bin/rbeacon
+opt/xcat/bin/xcatclient opt/xcat/bin/rvitals
+opt/xcat/bin/xcatclient opt/xcat/bin/nodestat
+opt/xcat/bin/xcatclient opt/xcat/bin/rinv
+opt/xcat/bin/xcatclient opt/xcat/bin/rflash
+opt/xcat/bin/xcatclient opt/xcat/bin/rspreset
+opt/xcat/bin/xcatclient opt/xcat/bin/rsetboot
+opt/xcat/bin/xcatclient opt/xcat/bin/rbootseq
+opt/xcat/bin/xcatclient opt/xcat/bin/reventlog
+opt/xcat/bin/xcatclient opt/xcat/bin/rmhypervisor
+opt/xcat/bin/xcatclient opt/xcat/bin/nodels
+opt/xcat/bin/xcatclient opt/xcat/bin/nodech
+opt/xcat/bin/xcatclient opt/xcat/bin/noderm
+opt/xcat/bin/xcatclient opt/xcat/bin/rnetboot
+opt/xcat/bin/xcatclient opt/xcat/bin/getmacs
+opt/xcat/bin/xcatclient opt/xcat/bin/mkvm
+opt/xcat/bin/xcatclient opt/xcat/bin/rmvm
+opt/xcat/bin/xcatclient opt/xcat/bin/lsvm
+opt/xcat/bin/xcatclient opt/xcat/bin/chvm
+opt/xcat/bin/xcatclient opt/xcat/bin/tabgrep
+opt/xcat/bin/xcatclient opt/xcat/bin/renergy
+opt/xcat/bin/xcatclient opt/xcat/bin/litetree
+opt/xcat/bin/xcatclient opt/xcat/bin/litefile
+opt/xcat/bin/xcatclient opt/xcat/bin/lslite
+opt/xcat/bin/xcatclient opt/xcat/bin/lsflexnode
+opt/xcat/bin/xcatclient opt/xcat/bin/rmflexnode
+opt/xcat/bin/xcatclient opt/xcat/bin/mkflexnode
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/lsslp
+opt/xcat/bin/xcatclient opt/xcat/bin/imgcapture
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/swapnodes
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/nodegrpch
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/tabdump
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/tabprune
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/packimage
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/rmimage
+opt/xcat/bin/xcatclient opt/xcat/sbin/makedns
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/gettab
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/nodeadd
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/xcatsetup
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/makenetworks
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/copycds
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/regnotif
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/unregnotif
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/monstart
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/monstop
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/monls
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/moncfg
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/mondecfg
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/monadd
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/monrm
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/monshow
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/sinv
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/rollupdate
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/runrollupdate
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/webrun
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/ilitefile
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/liteimg
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/gennr
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/imgexport
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/imgimport
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/mkdsklsnode
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/rmdsklsnode
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/mknimimage
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/chkosimage
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/rmnimimage
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/nimnodeset
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/nimnodecust
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/mkdef
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/chdef
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/lsdef
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/rmdef
+opt/xcat/bin/xcatDBcmds opt/xcat/bin/xcat2nim
+opt/xcat/bin/xdsh opt/xcat/bin/xdcp
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/mknb
+opt/xcat/bin/xcatclient opt/xcat/bin/mkhwconn
+opt/xcat/bin/xcatclient opt/xcat/bin/rmhwconn
+opt/xcat/bin/xcatclient opt/xcat/bin/lshwconn
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/makeroutes
+opt/xcat/bin/xcatclientnnr opt/xcat/sbin/snmove
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/lsxcatd
+opt/xcat/bin/xcatclient opt/xcat/bin/postage