diff --git a/syslinux-4.04-isohybrid_mbr.diff b/syslinux-4.04-isohybrid_mbr.diff
new file mode 100644
index 0000000..b45cb28
--- /dev/null
+++ b/syslinux-4.04-isohybrid_mbr.diff
@@ -0,0 +1,27 @@
+diff --git a/utils/isohybrid.c b/utils/isohybrid.c
+index 09f4520..954b5ed 100644
+--- a/utils/isohybrid.c
++++ b/utils/isohybrid.c
+@@ -653,12 +653,10 @@ initialise_mbr(uint8_t *mbr)
+           continue;
+         }
+ 
+-        if (i == 1)
+-            mbr[0] = 0x80;
+-
+         if (i == part_data)
+         {
+             chs = ofs2chs(offset);
++            mbr[0] = 0x80;
+             mbr[1] = chs >> 8;
+             mbr[2] = chs >> 16;
+             mbr[3] = chs >> 24;
+@@ -945,7 +943,7 @@ main(int argc, char *argv[])
+     }
+ 
+     if (!(mode & (MODE_MBR | MODE_GPT))) {
+-        mode |= (mode & EFI) ? MODE_GPT : MODE_MBR;
++        mode |= MODE_MBR;
+     }
+ 
+     if ((mode & EFI) && !offset) type = 0;
diff --git a/syslinux.changes b/syslinux.changes
index 80994e1..b094bf7 100644
--- a/syslinux.changes
+++ b/syslinux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 28 16:00:50 CET 2013 - snwint@suse.de
+
+- isohybrid_mbr.diff: write only mbr unless explicitly specified otherwise
+
 -------------------------------------------------------------------
 Mon Feb 18 10:14:42 CET 2013 - snwint@suse.de
 
diff --git a/syslinux.spec b/syslinux.spec
index aa480c9..9229513 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -44,6 +44,7 @@ Patch6:         %{name}-%{version}-libext2fs.diff
 Patch7:         %{name}-%{version}-gcc47.diff
 Patch8:         %{name}-%{version}-isohybrid_efi.diff
 Patch9:         %{name}-%{version}-isohybrid_efi_optional.diff
+Patch10:        %{name}-%{version}-isohybrid_mbr.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -69,6 +70,7 @@ Authors:
 %patch7 -p0
 %patch8 -p0
 %patch9 -p1
+%patch10 -p1
 
 %build
 cp %{SOURCE2} .