diff --git a/elilo/debian/control b/elilo/debian/control
index be4f2f3..5c01dc6 100644
--- a/elilo/debian/control
+++ b/elilo/debian/control
@@ -8,6 +8,6 @@ Standards-Version: 3.8.4
 Package: elilo-xcat
 Section: utils
 Priority: extra
-Architecture: any
+Architecture: all
 Description: Open source implementation of Service Location Protocol V2
  Open source implementation of Service Location Protocol V2
diff --git a/xnba/README b/xnba/README
new file mode 100644
index 0000000..49187bb
--- /dev/null
+++ b/xnba/README
@@ -0,0 +1,9 @@
+xNBA for Debian
+---------------
+
+./make_deb.sh: build the package from the binaries under "binary" directory
+./rebuild.sh : build the package from source code, this should only run on amd64/x86_64 platform, it will update the files under "binary" directory after compilation
+
+
+
+
diff --git a/xnba/binary/xnba.efi b/xnba/binary/xnba.efi
new file mode 100644
index 0000000..1fe1356
Binary files /dev/null and b/xnba/binary/xnba.efi differ
diff --git a/xnba/binary/xnba.kpxe b/xnba/binary/xnba.kpxe
new file mode 100644
index 0000000..544963e
Binary files /dev/null and b/xnba/binary/xnba.kpxe differ
diff --git a/xnba/build/rules.fromBIN b/xnba/build/rules.fromBIN
new file mode 100755
index 0000000..a4ac749
--- /dev/null
+++ b/xnba/build/rules.fromBIN
@@ -0,0 +1,89 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess. 
+#
+# This version is for packages that are architecture dependent.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+#ifeq ($(TARGET_ARCH),amd64)
+#	# Add here commands to compile the package.
+#	$(MAKE) -C src bin/undionly.kkpxe
+#	$(MAKE) -C src bin-x86_64-efi/snponly.efi
+#endif
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+#ifeq ($(TARGET_ARCH),amd64)
+#	# Add here commands to clean up after the build process.
+#	$(MAKE) -C src clean
+#endif
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+#ifeq ($(TARGET_ARCH),amd64)
+#	# Add here commands to install the package into debian/<packagename>
+#	cp src/bin/undionly.kkpxe              `pwd`/binary/xnba.kpxe
+#	cp src/bin-x86_64-efi/snponly.efi      `pwd`/binary/xnba.efi
+#	cp src/bin/undionly.kkpxe              `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.kpxe
+#	cp src/bin-x86_64-efi/snponly.efi      `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi
+#else
+	cp binary/xnba.kpxe `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.kpxe
+	cp binary/xnba.efi  `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi 
+#endif
+	#dh_movefiles
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installcatalogs
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+#	dh_installwm
+#	dh_installudev
+#	dh_lintian
+#	dh_bugfiles
+#	dh_undocumented
+	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
diff --git a/xnba/debian/control b/xnba/debian/control
index 66ff5a1..bf1d82f 100644
--- a/xnba/debian/control
+++ b/xnba/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 1.0.3
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/gpxe.git;a=summary
 
 Package: xnba-undi
-Architecture: any
+Architecture: all
 Description: xCAT Network Boot Agent for x86 PXE hosts
  The xCAT Network Boot Agent is a slightly modified version of gPXE.  
  It provides enhanced boot features for any UNDI compliant x86 host.  
diff --git a/xnba/make_deb.sh b/xnba/make_deb.sh
index 976ca16..87c12b4 100755
--- a/xnba/make_deb.sh
+++ b/xnba/make_deb.sh
@@ -1,8 +1,3 @@
 #!/bin/bash
 
-tar xvfj xnba-1.0.3.tar.bz2 
-cd xnba-1.0.3
-cp -rL ../debian .
-dpkg-buildpackage -uc -us
-cd -
-rm -rf xnba-1.0.3 
+dpkg-buildpackage -uc -us -R./build/rules.fromBIN 
diff --git a/xnba/rebuild.sh b/xnba/rebuild.sh
new file mode 100755
index 0000000..ab4b9a8
--- /dev/null
+++ b/xnba/rebuild.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+tar xvfj xnba-1.0.3.tar.bz2 
+cd xnba-1.0.3
+cp -rL ../debian .
+dpkg-buildpackage -uc -us  -aamd64 
+cd -
+rm -rf xnba-1.0.3 
+cp `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.kpxe `pwd`/binary/
+cp `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi  `pwd`/binary/