diff --git a/krb5-1.8.1-gssapi-error-table.dif b/krb5-1.8.1-gssapi-error-table.dif
new file mode 100644
index 0000000..fddfc1e
--- /dev/null
+++ b/krb5-1.8.1-gssapi-error-table.dif
@@ -0,0 +1,13 @@
+Index: krb5-1.8.1/src/lib/gssapi/krb5/gssapi_krb5.c
+===================================================================
+--- krb5-1.8.1.orig/src/lib/gssapi/krb5/gssapi_krb5.c
++++ krb5-1.8.1/src/lib/gssapi/krb5/gssapi_krb5.c
+@@ -740,7 +740,7 @@ int gss_krb5int_lib_init(void)
+     printf("gss_krb5int_lib_init\n");
+ #endif
+ 
+-    add_error_table(&et_ggss_error_table);
++    add_error_table(&et_k5g_error_table);
+ 
+ #ifndef LEAN_CLIENT
+     err = k5_mutex_finish_init(&gssint_krb5_keytab_lock);
diff --git a/krb5-mini.changes b/krb5-mini.changes
index 6fc48ec..b57f654 100644
--- a/krb5-mini.changes
+++ b/krb5-mini.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 21 21:31:53 UTC 2010 - lchiquitto@novell.com
+
+- add correct error table when initializing gss-krb5 (bnc#606584,
+  bnc#608295)
+
 -------------------------------------------------------------------
 Wed May 19 14:27:19 CEST 2010 - mc@suse.de
 
diff --git a/krb5-mini.spec b/krb5-mini.spec
index bc1ae48..23253b6 100644
--- a/krb5-mini.spec
+++ b/krb5-mini.spec
@@ -57,6 +57,7 @@ Patch7:         krb5-1.6.3-ktutil-manpage.dif
 Patch8:         krb5-1.6.3-fix-ipv6-query.dif
 Patch9:         krb5-1.7-MITKRB5-SA-2010-004.dif
 Patch10:        krb5-MITKRB5-SA-2010-005.dif
+Patch11:        krb5-1.8.1-gssapi-error-table.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         mktemp, grep, /bin/touch, coreutils
 PreReq:         %insserv_prereq %fillup_prereq 
@@ -206,6 +207,7 @@ Authors:
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -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 6fc48ec..b57f654 100644
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 21 21:31:53 UTC 2010 - lchiquitto@novell.com
+
+- add correct error table when initializing gss-krb5 (bnc#606584,
+  bnc#608295)
+
 -------------------------------------------------------------------
 Wed May 19 14:27:19 CEST 2010 - mc@suse.de
 
diff --git a/krb5.spec b/krb5.spec
index 7fd6bdc..79e7bbb 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -57,6 +57,7 @@ Patch7:         krb5-1.6.3-ktutil-manpage.dif
 Patch8:         krb5-1.6.3-fix-ipv6-query.dif
 Patch9:         krb5-1.7-MITKRB5-SA-2010-004.dif
 Patch10:        krb5-MITKRB5-SA-2010-005.dif
+Patch11:        krb5-1.8.1-gssapi-error-table.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         mktemp, grep, /bin/touch, coreutils
 PreReq:         %insserv_prereq %fillup_prereq 
@@ -206,6 +207,7 @@ Authors:
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 # Rename the man pages so that they'll get generated correctly.
 pushd src
 cat %{SOURCE10} | while read manpage ; do