diff --git a/build-ubunturepo b/build-ubunturepo
index 75160e52a..b06829c9a 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -194,12 +194,12 @@ then
         if [ ! -d ../../$package_dir_name ];then
             mkdir -p "../../$package_dir_name"
         fi
-        packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT-UI xCAT xCATsn xCAT-test xCAT-OpenStack xCAT-OpenStack-baremetal xCAT-buildkit"
+        packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT-UI xCAT xCATsn xCAT-test xCAT-OpenStack xCAT-OpenStack-baremetal"
         target_archs=(amd64 ppc64el)
         for file in `echo $packages`
         do
             file_low=`echo $file | tr '[A-Z]' '[a-z]'`
-            if [ "$file" = "xCAT" ]; then
+            if [ "$file" = "xCAT" -o "$file" = "xCAT-genesis-scripts" ]; then
                 target_archs="amd64 ppc64el"
             else
                 target_archs="all"
@@ -208,8 +208,8 @@ then
             do
                 if grep -q $file $update_log || [ "$BUILDALL" == 1 -o "$file" = "perl-xCAT" ]; then
                     rm -f ../../$package_dir_name/${file_low}_*.$target_arch.deb
-                    #only for genesis package
-                    rm -f ../../$package_dir_name/${file_low}-amd64_*.deb
+                    #genesis scripts package, don't remove genesis amd64 files
+                    #rm -f ../../$package_dir_name/${file_low}-amd64_*.deb
                     cd $file
                     dch -v $pkg_version -b -c debian/changelog $build_string
                     if [ "$target_arch" = "all" ]; then
diff --git a/xCAT-genesis-scripts/debian/changelog b/xCAT-genesis-scripts/debian/changelog
index 461db1cf3..1780cb54a 100644
--- a/xCAT-genesis-scripts/debian/changelog
+++ b/xCAT-genesis-scripts/debian/changelog
@@ -1,4 +1,4 @@
-xcat-genesis-scripts-amd64 (2.8-snap20130205) precise; urgency=low
+xcat-genesis-scripts (2.8-snap20130205) precise; urgency=low
 
   * Nightly_Builds
 
diff --git a/xCAT-genesis-scripts/debian/control b/xCAT-genesis-scripts/debian/control
index 9e3b2f2ba..5ae63c3fb 100644
--- a/xCAT-genesis-scripts/debian/control
+++ b/xCAT-genesis-scripts/debian/control
@@ -1,13 +1,13 @@
-Source: xcat-genesis-scripts-amd64
+Source: xcat-genesis-scripts
 Section: admin
 Priority: extra
 Maintainer: xCAT <xcat-user@lists.sourceforge.net>
 Build-Depends: debhelper (>= 8.0.0)
 Standards-Version: 3.9.2
 
-Package: xcat-genesis-scripts-amd64
-Architecture: all
-Depends: xcat-genesis-base-amd64
+Package: xcat-genesis-scripts
+Architecture: amd64 ppc64el
+Depends: xcat-genesis-base-amd64[any-amd64],xcat-genesis-base-ppc64[any-ppc64el]
 Description: xCAT genesis 
 	(Genesis Enhanced Netboot Environment for System Information and Servicing) is a small, embedded-like environment for xCAT's use in discovery and management actions when interaction with an OS is infeasible. This package reperesents the EPL content that is more tightly bound to specific xcat-core versions
 
diff --git a/xCAT-genesis-scripts/debian/dirs b/xCAT-genesis-scripts/debian/dirs
deleted file mode 100644
index 699b7d54d..000000000
--- a/xCAT-genesis-scripts/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-/opt/xcat/share/xcat/netboot/genesis/x86_64/fs
diff --git a/xCAT-genesis-scripts/debian/install b/xCAT-genesis-scripts/debian/install
deleted file mode 100644
index 5cb0e422d..000000000
--- a/xCAT-genesis-scripts/debian/install
+++ /dev/null
@@ -1,3 +0,0 @@
-./etc/ opt/xcat/share/xcat/netboot/genesis/x86_64/fs
-./bin/ opt/xcat/share/xcat/netboot/genesis/x86_64/fs
-./sbin/ opt/xcat/share/xcat/netboot/genesis/x86_64/fs
diff --git a/xCAT-genesis-scripts/debian/rules b/xCAT-genesis-scripts/debian/rules
index c64076ab2..de2866385 100755
--- a/xCAT-genesis-scripts/debian/rules
+++ b/xCAT-genesis-scripts/debian/rules
@@ -9,6 +9,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+
+ifneq ($(DEB_BUILD_ARCH),ppc64el)
+        export TARGET_ARCH=x86_64
+else
+        export TARGET_ARCH=ppc64
+endif
+export installdir=/opt/xcat/share/xcat/netboot/genesis/$(TARGET_ARCH)/fs
+export installtodir=opt/xcat/share/xcat/netboot/genesis/$(TARGET_ARCH)/fs
+
 build:
 	pwd
 
@@ -21,8 +30,11 @@ install:
 	pwd
 	dh_testdir
 	dh_testroot
-	dh_installdirs
+	dh_installdirs $(installdir)
 	dh_install -X".svn"
+	dh_install ./etc/ $(installtodir)
+	dh_install ./bin/ $(installtodir)
+	dh_install ./sbin/ $(installtodir)
 	dh_compress
 	dh_installdeb
 	dh_gencontrol