diff --git a/ipxe-update.sh b/ipxe-update.sh
index 22b750a1..c42abdd8 100755
--- a/ipxe-update.sh
+++ b/ipxe-update.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# Builds ipxe binaries from github sources or given tarball
+
+VERSION=v1.21.1
 
 ARCH=x86_64
 
@@ -11,11 +14,17 @@ EFI_output=`pwd`/staticfiles/${ARCH}.efi
 set -xe
 
 
-TMPDIR=`mktemp -d`
-cd "$TMPDIR"
+TMPDIR=`mktemp -d /tmp/ipxebuild.XXXXXX`
+if [ -f "$1" ] ; then
+  WRKDIR=`pwd`
+  cd "$TMPDIR"
+  tar xzf $WRKDIR/$1
+else
+  cd "$TMPDIR"
+  git clone --depth 1 --branch $VERSION https://github.com/ipxe/ipxe.git
+fi
 
-git clone https://github.com/ipxe/ipxe.git
-cd ipxe/src
+cd ipxe*/src
 
 sed -i.bak \
     -e 's,//\(#define.*CONSOLE_SERIAL.*\),\1,' \
@@ -25,10 +34,11 @@ sed -i.bak \
 sed -i.bak \
     -e 's,//\(#define.*IMAGE_ZLIB.*\),\1,' \
     -e 's,//\(#define.*IMAGE_GZIP.*\),\1,' \
+    -e 's,//\(#define.*VLAN_CMD.*\),\1,' \
     config/general.h
 
-make -j 8 $PCBIOS
-make -j 8 $EFI
+make -j 8 $PCBIOS "$@"
+make -j 8 $EFI "$@"
 
 
 cp $PCBIOS $PCBIOS_output
diff --git a/staticfiles/README.md b/staticfiles/README.md
new file mode 100644
index 00000000..8e0e8b34
--- /dev/null
+++ b/staticfiles/README.md
@@ -0,0 +1,2 @@
+# iPXE binaries
+Binaries can be rebuild with the `ixpe-update.sh` script.
diff --git a/staticfiles/x86_64.efi b/staticfiles/x86_64.efi
index cbe74ed7..5a3e3638 100644
Binary files a/staticfiles/x86_64.efi and b/staticfiles/x86_64.efi differ
diff --git a/staticfiles/x86_64.kpxe b/staticfiles/x86_64.kpxe
index bb33a275..51264c12 100644
Binary files a/staticfiles/x86_64.kpxe and b/staticfiles/x86_64.kpxe differ