diff --git a/file-python-func.patch b/file-python-func.patch
new file mode 100644
index 0000000..59ced47
--- /dev/null
+++ b/file-python-func.patch
@@ -0,0 +1,13 @@
+diff --git a/magic/Magdir/python b/magic/Magdir/python
+index e592803..c786469 100644
+--- a/magic/Magdir/python
++++ b/magic/Magdir/python
+@@ -59,3 +59,8 @@
+ !:mime text/x-python
+ >&0	search/4096	finally:	Python script text executable
+ !:mime text/x-python
++
++# def name(args, args):
++0	regex	 \^(\ |\\t)*def\ +[a-zA-Z]+
++>&0	regex	\ *\\(([a-zA-Z]|,|\ )*\\):$ Python script text executable
++!:mime text/x-python
diff --git a/file-qed-vdi-image.patch b/file-qed-vdi-image.patch
new file mode 100644
index 0000000..eba59d7
--- /dev/null
+++ b/file-qed-vdi-image.patch
@@ -0,0 +1,22 @@
+diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
+index 560d360..83724c5 100644
+--- a/magic/Magdir/msdos
++++ b/magic/Magdir/msdos
+@@ -815,6 +815,17 @@
+ 
+ 0	string/b	QEVM		QEMU suspend to disk image
+ 
++# QEMU QED Image
++# http://wiki.qemu.org/Features/QED/Specification
++0	string/b	QED\0		QEMU QED Image
++
++# VDI Image
++64	string/b	\x7f\x10\xda\xbe	VDI Image
++>68	string/b	\x01\x00\x01\x00	version 1.1
++>0	string		>\0			(%s)
++>368	lequad		x			 \b, %lld bytes
++
++
+ 0	string/b	Bochs\ Virtual\ HD\ Image	Bochs disk image,
+ >32	string	x				type %s,
+ >48	string	x				subtype %s
diff --git a/file.spec b/file.spec
index c07a3bf..28696e4 100644
--- a/file.spec
+++ b/file.spec
@@ -4,8 +4,8 @@
 
 Summary: A utility for determining file types
 Name: file
-Version: 5.10
-Release: 5%{?dist}
+Version: 5.11
+Release: 1%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -15,6 +15,8 @@ Patch0: file-localmagic.patch
 Patch1: file-tnef.patch
 Patch2: file-5.10-strength.patch
 Patch3: file-5.10-sticky-bit.patch
+Patch4: file-python-func.patch
+Patch5: file-qed-vdi-image.patch
 URL: http://www.darwinsys.com/file/
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +74,8 @@ file(1) command.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -156,6 +160,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Feb 27 2012 Jan Kaluza <jkaluza@redhat.com> - 5.11-1
+- fix #796130 - update to file-5.11
+- fix #796209 - recognize VDI images
+- fix #795709 - recognize QED images
+
 * Wed Jan 18 2012 Jan Kaluza <jkaluza@redhat.com> - 5.10-5
 - fix detection of ASCII text files with setuid, setgid, or sticky bits