diff --git a/krb5-1.9-gss_display_status-iakerb.patch b/krb5-1.9-gss_display_status-iakerb.patch
new file mode 100644
index 0000000..9fa917a
--- /dev/null
+++ b/krb5-1.9-gss_display_status-iakerb.patch
@@ -0,0 +1,14 @@
+Index: krb5-1.9.1/src/lib/gssapi/krb5/disp_status.c
+===================================================================
+--- krb5-1.9.1.orig/src/lib/gssapi/krb5/disp_status.c
++++ krb5-1.9.1/src/lib/gssapi/krb5/disp_status.c
+@@ -167,7 +167,8 @@ krb5_gss_display_status(minor_status, st
+ 
+     if ((mech_type != GSS_C_NULL_OID) &&
+         !g_OID_equal(gss_mech_krb5, mech_type) &&
+-        !g_OID_equal(gss_mech_krb5_old, mech_type)) {
++        !g_OID_equal(gss_mech_krb5_old, mech_type) &&
++        !g_OID_equal(gss_mech_iakerb, mech_type)) {
+         *minor_status = 0;
+         return(GSS_S_BAD_MECH);
+     }
diff --git a/krb5-mini.changes b/krb5-mini.changes
index 416c4a5..530f8a5 100644
--- a/krb5-mini.changes
+++ b/krb5-mini.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 18 08:35:52 UTC 2011 - rhafer@suse.de
+
+- fix minor error messages for the IAKERB GSSAPI mechanism
+  (see: http://krbdev.mit.edu/rt/Ticket/Display.html?id=7020)
+
 -------------------------------------------------------------------
 Mon Oct 17 16:11:03 CEST 2011 - mc@suse.de
 
diff --git a/krb5-mini.spec b/krb5-mini.spec
index 85dc3aa..1630ab5 100644
--- a/krb5-mini.spec
+++ b/krb5-mini.spec
@@ -72,6 +72,7 @@ Patch24:        krb5-trunk-chpw-err.patch
 Patch25:        krb5-trunk-gss_delete_sec.patch
 Patch26:        krb5-trunk-kadmin-oldproto.patch
 Patch30:        krb5-1.9-MITKRB5-SA-2011-006.dif
+Patch31:        krb5-1.9-gss_display_status-iakerb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         mktemp, grep, /bin/touch, coreutils
 PreReq:         %insserv_prereq %fillup_prereq 
@@ -234,6 +235,7 @@ Authors:
 %patch25 -p1
 %patch26
 %patch30 -p1
+%patch31 -p1
 # Rename the man pages so that they'll get generated correctly.
 pushd src
 cat %{SOURCE10} | while read manpage ; do
diff --git a/krb5.changes b/krb5.changes
index 416c4a5..530f8a5 100644
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 18 08:35:52 UTC 2011 - rhafer@suse.de
+
+- fix minor error messages for the IAKERB GSSAPI mechanism
+  (see: http://krbdev.mit.edu/rt/Ticket/Display.html?id=7020)
+
 -------------------------------------------------------------------
 Mon Oct 17 16:11:03 CEST 2011 - mc@suse.de
 
diff --git a/krb5.spec b/krb5.spec
index 08b9c75..0b2146b 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -72,6 +72,7 @@ Patch24:        krb5-trunk-chpw-err.patch
 Patch25:        krb5-trunk-gss_delete_sec.patch
 Patch26:        krb5-trunk-kadmin-oldproto.patch
 Patch30:        krb5-1.9-MITKRB5-SA-2011-006.dif
+Patch31:        krb5-1.9-gss_display_status-iakerb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         mktemp, grep, /bin/touch, coreutils
 PreReq:         %insserv_prereq %fillup_prereq 
@@ -234,6 +235,7 @@ Authors:
 %patch25 -p1
 %patch26
 %patch30 -p1
+%patch31 -p1
 # Rename the man pages so that they'll get generated correctly.
 pushd src
 cat %{SOURCE10} | while read manpage ; do