diff --git a/xnba/README b/xnba/README
index 2eb9542..c0200de 100644
--- a/xnba/README
+++ b/xnba/README
@@ -1,10 +1,12 @@
 Get latest ipxe source from git.ipxe.org
 ----------------------------------------
-Current version is 1.20.1, the tar command below will use 1.20.1 to generate xnba-1.20.1.tar.bz2 the source code of ipxe version 1.20.1 (10/29/2020 ?)
+Current ipxe version is 1.21.1 (released Dec 31,2020), the tar command below will generate xnba-1.21.1.tar.bz2
 
-1. git clone git://git.ipxe.org/ipxe.git
-2. tar Jcvf xnba-<version>.tar.bz2 --exclude-vcs ipxe
-3. Optionally, if building is needed - cd src; make
+1. Clone ipxe from github - git clone git://git.ipxe.org/ipxe.git
+2. Verify version number - git describe --tags --always --long --abbrev=1 --match "v*"
+3. Rename ipxe directory to xnba-<version> - mv ipxe xnba-1.21.1
+4. Tar xnba-<version> directory - tar Jcvf xnba-1.21.1.tar.bz2 --exclude-vcs xnba-1.21.1
+5. Optionally, if building is needed - cd src; make
 
 
 Patch ipxe source
diff --git a/xnba/debian/changelog b/xnba/debian/changelog
index b0daadd..7c4ae7b 100644
--- a/xnba/debian/changelog
+++ b/xnba/debian/changelog
@@ -1,9 +1,14 @@
+xnba-undi (1.21.1-1) unstable; urgency=low
+
+  * Debian build for xnba-undi version 1.21.1-1
+
+ -- Mark Gurevich <gurevich@us.ibm.com>  Mon, 27 Sep 2021 15:49:48 +0800
+
 xnba-undi (1.20.1-1) unstable; urgency=low
 
   * Debian build for xnba-undi version 1.20.1-1
 
  -- Mark Gurevich <gurevich@us.ibm.com>  Tue, 8 Jun 2021 15:49:48 +0800
-
 xnba-undi (1.20.1-0) unstable; urgency=low
 
   * Debian build for xnba-undi version 1.20.1
diff --git a/xnba/debian/control b/xnba/debian/control
index ddd47ca..fc0ff20 100644
--- a/xnba/debian/control
+++ b/xnba/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: xCAT <xcat-user@lists.sourceforge.net>
 Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 1.20.1-1 
+Standards-Version: 1.21.1-1 
 #Homepage: <insert the upstream URL, if relevant>
 #Vcs-Git: git://git.debian.org/collab-maint/gpxe.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/gpxe.git;a=summary
diff --git a/xnba/debian/files b/xnba/debian/files
index 0be69e8..2353a4f 100644
--- a/xnba/debian/files
+++ b/xnba/debian/files
@@ -1 +1 @@
-xnba-undi_1.20.1-1_amd64.deb admin extra
+xnba-undi_1.21.1-1_amd64.deb admin extra
diff --git a/xnba/ipxe-verbump.patch b/xnba/ipxe-verbump.patch
index 190f16a..21af721 100644
--- a/xnba/ipxe-verbump.patch
+++ b/xnba/ipxe-verbump.patch
@@ -9,7 +9,7 @@ index 69139dc1..d0e3f43f 100644
 -VERSION_MINOR	= 0
 -VERSION_PATCH	= 0
 -EXTRAVERSION	= +
-+VERSION_MINOR	= 20
++VERSION_MINOR	= 21
 +VERSION_PATCH	= 1
 +EXTRAVERSION	= -1
  endif
diff --git a/xnba/rebuild.sh b/xnba/rebuild.sh
index 6fe3318..6886a5b 100755
--- a/xnba/rebuild.sh
+++ b/xnba/rebuild.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-tar xvf ./xnba-1.20.1.tar.bz2
-cd xnba-1.20.1 
+tar xvf ./xnba-1.21.1.tar.bz2
+cd xnba-1.21.1 
 cp -rL ../debian .
 dpkg-buildpackage -uc -us  -aamd64 
 cd -
-rm -rf xnba-1.20.1 
+rm -rf xnba-1.21.1 
 cp `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.kpxe `pwd`/binary/
 cp `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi  `pwd`/binary/
diff --git a/xnba/xnba-1.21.1.tar.bz2 b/xnba/xnba-1.21.1.tar.bz2
new file mode 100644
index 0000000..cdecbeb
Binary files /dev/null and b/xnba/xnba-1.21.1.tar.bz2 differ
diff --git a/xnba/xnba-undi.spec b/xnba/xnba-undi.spec
index 2c0372f..f85675a 100644
--- a/xnba/xnba-undi.spec
+++ b/xnba/xnba-undi.spec
@@ -1,5 +1,5 @@
 Name:           xnba-undi
-Version:        1.20.1 
+Version:        1.21.1 
 Release:        1
 Summary:        xCAT Network Boot Agent for x86 PXE hosts
 
@@ -14,7 +14,7 @@ BuildArch:	noarch
 %define os_release %(rpm -q --qf '%%{release}' %{Distribution}-release | cut -d"." -f 1)
 
 
-Source:  xnba-1.20.1.tar.bz2 
+Source:  xnba-1.21.1.tar.bz2 
 Patch1:  ipxe-branding.patch
 Patch2:  ipxe-machyp.patch
 Patch3:  ipxe-xnbaclass.patch
@@ -26,7 +26,7 @@ The xCAT Network Boot Agent is a slightly modified version of iPXE.  It provides
 
 %prep
 
-%setup  -n xnba-1.20.1 
+%setup  -n xnba-1.21.1 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1