diff --git a/elilo/elilo-big-bzimage-limit.patch b/elilo/elilo-big-bzimage-limit.patch
new file mode 100644
index 0000000..9bc6828
--- /dev/null
+++ b/elilo/elilo-big-bzimage-limit.patch
@@ -0,0 +1,17 @@
+Nowadays x86_64 bzImage with a lot of built-in drivers may well be over 8 MB and
+it will not boot with kernel_size limited at 8 MB. Increase the limit to 15 MB.
+
+Reading file size at runtime could be a better solution.
+
+diff -uNr elilo-3.16-source.orig/x86_64/bzimage.c elilo-3.16-source/x86_64/bzimage.c
+--- elilo-3.16-source.orig/x86_64/bzimage.c	2012-11-19 22:01:04.000000000 +0100
++++ elilo-3.16-source/x86_64/bzimage.c	2014-05-14 13:44:00.352004159 +0200
+@@ -34,7 +34,7 @@
+ boot_params_t *param_start = NULL;
+ UINTN param_size = 0;
+ 
+-UINTN kernel_size = 0x800000;	/* 8M (default x86_64 bzImage size limit) */
++UINTN kernel_size = 0xF00000;
+ 
+ static VOID *
+ bzImage_alloc()
diff --git a/elilo/elilo-xcat-3.14-5.noarch.rpm b/elilo/elilo-xcat-3.14-5.noarch.rpm
new file mode 100644
index 0000000..38ae549
Binary files /dev/null and b/elilo/elilo-xcat-3.14-5.noarch.rpm differ
diff --git a/elilo/elilo-xcat.spec b/elilo/elilo-xcat.spec
index 99fa05a..c1f695a 100644
--- a/elilo/elilo-xcat.spec
+++ b/elilo/elilo-xcat.spec
@@ -1,6 +1,6 @@
 Name:           elilo-xcat
 Version:        3.14
-Release:        4
+Release:        5
 Summary:        xCAT patched variant of elilo
 
 Group:          System Environment/Kernel
@@ -15,7 +15,8 @@ BuildArch:	noarch
 
 
 Source0: elilo-3.14-source.tar.gz
-Patch: elilo-xcat.patch
+Patch1: elilo-xcat.patch
+Patch2: elilo-big-bzimage-limit.patch
 
 %description
 elilo with patches from the xCAT team.  Most significantly, adds iPXE usage to the network support
@@ -23,7 +24,8 @@ elilo with patches from the xCAT team.  Most significantly, adds iPXE usage to t
 %prep
 
 %setup   -n elilo
-%patch -p1
+%patch1  -p1
+%patch2  -p1
 
 %build
 
diff --git a/elilo/gnu-efi-3.0g-2.el6.x86_64.rpm b/elilo/gnu-efi-3.0g-2.el6.x86_64.rpm
new file mode 100644
index 0000000..a1ac7dc
Binary files /dev/null and b/elilo/gnu-efi-3.0g-2.el6.x86_64.rpm differ