diff --git a/dmidecode-2.11-manpage_update.patch b/dmidecode-2.11-manpage_update.patch
new file mode 100644
index 0000000..42ed2ec
--- /dev/null
+++ b/dmidecode-2.11-manpage_update.patch
@@ -0,0 +1,55 @@
+diff -up dmidecode-2.11/CHANGELOG.manpage_update dmidecode-2.11/CHANGELOG
+--- dmidecode-2.11/CHANGELOG.manpage_update	2012-03-26 12:55:08.415579519 +0200
++++ dmidecode-2.11/CHANGELOG	2012-03-26 12:56:48.657586111 +0200
+@@ -1,3 +1,9 @@
++2012-03-26  Anton Arapov  <anton@redhat.com>
++
++	* man/dmidecode.8: Add missing DMI type introduced with SMBIOS 2.7+, and
++	  include the information about the extra output when dmidecode is run
++	  on a hardware that has non-supported SMBIOS version.
++
+ 2012-03-12  Anton Arapov  <anton@redhat.com>
+ 
+ 	* dmioem.c: Add "PXE" to the HP OEM Type 209 output so it is similar to
+diff -up dmidecode-2.11/man/dmidecode.8.manpage_update dmidecode-2.11/man/dmidecode.8
+--- dmidecode-2.11/man/dmidecode.8.manpage_update	2012-03-26 12:53:10.185571745 +0200
++++ dmidecode-2.11/man/dmidecode.8	2012-03-26 12:34:54.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH DMIDECODE 8 "November 2008" "dmidecode"
++.TH DMIDECODE 8 "March 2012" "dmidecode"
+ .SH NAME
+ dmidecode \- \s-1DMI\s0 table decoder
+ .SH SYNOPSIS
+@@ -127,6 +127,13 @@ Display the version and exit
+ .P
+ Options --string, --type and --dump-bin
+ determine the output format and are mutually exclusive.
++.P
++Please note in case of
++.B dmidecode
++is run on a system with BIOS that boasts new SMBIOS specification, which
++is not supported by the tool yet, it will print out relevant message in
++addition to requested data on the very top of the output. Thus informs the
++output data is not reliable.
+ 
+ .SH "DMI TYPES"
+ The \s-1SMBIOS\s0 specification defines the following \s-1DMI\s0 types:
+@@ -138,7 +145,7 @@ r l.
+ Type	Information
+ 0	BIOS
+ 1	System
+-2	Base Board
++2	Baseboard
+ 3	Chassis
+ 4	Processor
+ 5	Memory Controller
+@@ -177,7 +184,8 @@ Type	Information
+ 38	IPMI Device
+ 39	Power Supply
+ 40	Additional Information
+-41	Onboard Device
++41	Onboard Devices Extended Information
++42	Management Controller Host Interface
+ .TE
+ 
+ Additionally, type 126 is used for disabled entries and type 127 is an
diff --git a/dmidecode.spec b/dmidecode.spec
index 88802f9..e7c98d9 100644
--- a/dmidecode.spec
+++ b/dmidecode.spec
@@ -1,7 +1,7 @@
 Summary:        Tool to analyse BIOS DMI data
 Name:           dmidecode
 Version:        2.11
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -12,6 +12,7 @@ Patch1:         dmidecode-2.11-smbios-271.patch
 Patch2:         dmidecode-2.11-chassis_fix.patch
 Patch3:         dmidecode-2.11-dmidecode_fix.patch
 Patch4:         dmidecode-2.11-dmioem_hp_fix.patch
+Patch5:         dmidecode-2.11-manpage_update.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  automake autoconf
 ExclusiveArch:  %{ix86} x86_64 ia64
@@ -34,6 +35,7 @@ I/O ports (e.g. serial, parallel, USB).
 %patch2 -p1 -b .chassis_fix
 %patch3 -p1 -b .dmidecode_fix
 %patch4 -p1 -b .dmioem_hp_fix
+%patch5 -p1 -b .manpage_update
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -57,6 +59,9 @@ rm -rf ${buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Mon Mar 26 2012 Anton Arapov <anton@redhat.com> - 1:2.11-8
+- Update dmidecode.8 manpage
+
 * Mon Mar 12 2012 Anton Arapov <anton@redhat.com> - 1:2.11-7
 - Add "PXE" to HP OEM Type 209 record output
 - Properly print the hexadecimal value of invalid string characters