diff --git a/build-ubunturepo b/build-ubunturepo
index e9e2e854c..5acce32fb 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -242,6 +242,10 @@ then
                     cd $file
                     dch -v $pkg_version -b -c debian/changelog $build_string
                     if [ "$target_arch" = "all" ]; then
+                        #xcat probe use some functions shipped by xCAT, for below reasons we need to copy files to xCAT-probe directory
+                        #1 make xcat probe code to be self-contained
+                        #2 don't maintain two files for each script
+                        #3 symbolic link can't work during package
                         if [ $file_low = "xcat-probe" ]; then
                             CURDIR=$(pwd)
                             mkdir -p ${CURDIR}/xCAT-probe/lib/perl/xCAT/
diff --git a/makerpm b/makerpm
index b14bf907e..c3cd442df 100755
--- a/makerpm
+++ b/makerpm
@@ -40,12 +40,18 @@ function makenoarch {
 				fi
 			fi 
 		fi
+
+                #xcat probe use some functions shipped by xCAT, for below reasons we need to copy files to xCAT-probe directory
+                #1 make xcat probe code to be self-contained
+                #2 don't maintain two files for each script
+                #3 symbolic link can't work during package
                 if [ $RPMNAME = "xCAT-probe" ]; then
                     CURDIR=$(pwd)
                     mkdir -p ${CURDIR}/xCAT-probe/lib/perl/xCAT/
                     cp -f ${CURDIR}/perl-xCAT/xCAT/NetworkUtils.pm ${CURDIR}/xCAT-probe/lib/perl/xCAT/
                     cp -f ${CURDIR}/perl-xCAT/xCAT/GlobalDef.pm ${CURDIR}/xCAT-probe/lib/perl/xCAT/
                 fi
+
 		tar --exclude .svn -czf $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz $RPMNAME
 		rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm
 		rpmbuild $QUIET -ta $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz
diff --git a/xCAT-probe/debian/changelog b/xCAT-probe/debian/changelog
index 7f9c4414a..fd4ac5c3d 100644
--- a/xCAT-probe/debian/changelog
+++ b/xCAT-probe/debian/changelog
@@ -1,5 +1,5 @@
-xcat-probe (2.7) maverick; urgency=low
+xcat-probe (2.12) xcat; urgency=low
 
   * initial build
 
- -- tonetto <tonetto@linux.vnet.ibm.com>  Thu, 22 Sep 2011 19:42:58 -0300
+ -- huweihua <huweihua@cn.ibm.com>  Fri, 1 Jul 2016 19:42:58 -0400
diff --git a/xCAT-probe/xCAT-probe.spec b/xCAT-probe/xCAT-probe.spec
index be947916e..8c5490ae8 100644
--- a/xCAT-probe/xCAT-probe.spec
+++ b/xCAT-probe/xCAT-probe.spec
@@ -1,4 +1,4 @@
-Summary: xCAT automated test tool
+Summary: xCAT diagnostic tool 
 Name: xCAT-probe
 Version: %(cat Version)
 Release: snap%(date +"%Y%m%d%H%M")
@@ -12,7 +12,6 @@ Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 Prefix: /opt/xcat
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
 
-# AIX will build with an arch of "ppc"
 %ifos linux
 BuildArch: noarch
 %endif
@@ -20,7 +19,7 @@ BuildArch: noarch
 Provides: xCAT-probe = %{version}
 
 %description
-Provides a toolkits to help probe all the possible issues in xCAT 
+CAT-probe provides a toolkits to probe potential issues with the xCAT cluster.
 
 %prep
 %setup -q -n xCAT-probe
@@ -44,8 +43,8 @@ cp -r subcmds  $RPM_BUILD_ROOT/%{prefix}/probe/
 chmod 755 $RPM_BUILD_ROOT/%{prefix}/probe/subcmds/*
 
 cp -r lib $RPM_BUILD_ROOT/%{prefix}/probe/
-chmod 644 $RPM_BUILD_ROOT/%{prefix}/probe/lib/perl/*
-chmod 644 $RPM_BUILD_ROOT/%{prefix}/probe/lib/perl/xCAT/*
+chmod -R 644 $RPM_BUILD_ROOT/%{prefix}/probe/lib/perl/
+chmod -R 644 $RPM_BUILD_ROOT/%{prefix}/probe/lib/perl/xCAT/
 
 %clean
 # This step does not happen until *after* the %files packaging below
@@ -58,8 +57,8 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}
 
 %changelog
-* Tue Sep 14 2010 - Airong Zheng <zhengar@us.ibm.com>
-- "Create xCAT autotest package"
+* Fri Jul 1 2016 - huweihu <huweihua@cn.ibm.com>
+- "Create xCAT probe package"
 
 %post