diff --git a/syslinux-4.04-isohybrid_efi_optional.diff b/syslinux-4.04-isohybrid_efi_optional.diff
new file mode 100644
index 0000000..526702b
--- /dev/null
+++ b/syslinux-4.04-isohybrid_efi_optional.diff
@@ -0,0 +1,15 @@
+diff --git a/utils/isohybrid.c b/utils/isohybrid.c
+index 7638bc0..09f4520 100644
+--- a/utils/isohybrid.c
++++ b/utils/isohybrid.c
+@@ -1028,7 +1028,9 @@ main(int argc, char *argv[])
+ 		errx(1, "%s: invalid efi catalogue", argv[0]);
+ 	    }
+ 	} else {
+-	    errx(1, "%s: unable to find efi image", argv[0]);
++	    fprintf(stderr, "%s: warning: unable to find efi image\n", argv[0]);
++	    mode &= ~EFI;
++	    part_efi = 0;
+ 	}
+     }
+ 
diff --git a/syslinux.changes b/syslinux.changes
index 62e01d9..80994e1 100644
--- a/syslinux.changes
+++ b/syslinux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 18 10:14:42 CET 2013 - snwint@suse.de
+
+- make uefi image optional
+
 -------------------------------------------------------------------
 Tue Feb  5 08:17:03 CET 2013 - snwint@suse.de
 
diff --git a/syslinux.spec b/syslinux.spec
index bac358b..aa480c9 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -43,6 +43,7 @@ Patch5:         %{name}-%{version}-md5pass.diff
 Patch6:         %{name}-%{version}-libext2fs.diff
 Patch7:         %{name}-%{version}-gcc47.diff
 Patch8:         %{name}-%{version}-isohybrid_efi.diff
+Patch9:         %{name}-%{version}-isohybrid_efi_optional.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -67,6 +68,7 @@ Authors:
 %patch6 -p0
 %patch7 -p0
 %patch8 -p0
+%patch9 -p1
 
 %build
 cp %{SOURCE2} .