diff --git a/parted-workaround-windows7-gpt-implementation.patch b/parted-workaround-windows7-gpt-implementation.patch
new file mode 100644
index 0000000..99c95cd
--- /dev/null
+++ b/parted-workaround-windows7-gpt-implementation.patch
@@ -0,0 +1,14 @@
+bnc#781688
+Index: parted-2.4/libparted/labels/gpt.c
+===================================================================
+--- parted-2.4.orig/libparted/labels/gpt.c
++++ parted-2.4/libparted/labels/gpt.c
+@@ -488,7 +488,7 @@ _has_hybrid_pmbr (const PedDevice *dev)
+ 
+   if ((mbr.PartitionRecord[0].OSType == EFI_PMBR_OSTYPE_EFI) &&
+       (mbr.PartitionRecord[0].StartingLBA == PED_CPU_TO_LE32(1)) &&
+-      (mbr.PartitionRecord[0].SizeInLBA == PED_CPU_TO_LE32(efi_gpt_expected_size)))
++      ((mbr.PartitionRecord[0].SizeInLBA == PED_CPU_TO_LE32(efi_gpt_expected_size)) || (mbr.PartitionRecord[0].SizeInLBA == PED_CPU_TO_LE32(0xFFFFFFFF))))
+         /* pMBR is not hybrid */
+         has_hybrid_pmbr = 0;
+ 
diff --git a/parted.changes b/parted.changes
index 4770f83..ec13f98 100644
--- a/parted.changes
+++ b/parted.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 27 13:40:56 UTC 2012 - puzel@suse.com
+
+- add parted-workaround-windows7-gpt-implementation.patch
+  (bnc#781688) 
+
 -------------------------------------------------------------------
 Fri Jul 27 09:14:44 UTC 2012 - aj@suse.de
 
diff --git a/parted.spec b/parted.spec
index b554e0c..96e609d 100644
--- a/parted.spec
+++ b/parted.spec
@@ -46,6 +46,7 @@ Patch17:        fix-nilfs2-probe-function.patch
 Patch18:        parted-fix-cciss-partition-naming.patch
 Patch19:        dummy-bootcode-only-for-x86.patch
 Patch20:        parted-stdio.h.patch
+Patch21:        parted-workaround-windows7-gpt-implementation.patch
 Requires:       /sbin/udevadm
 BuildRequires:  check-devel
 BuildRequires:  device-mapper-devel >= 1.02.33
@@ -114,6 +115,7 @@ to develop applications that require these.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 export CFLAGS="%{optflags} `ncursesw6-config --cflags`"