diff --git a/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch b/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
index d11b475..5ff086a 100644
--- a/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+++ b/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
@@ -196,6 +196,18 @@ Index: gdb-6.8cvs20080219/gdb/target.c
  
    return addr;
  }
+--- ./gdb/elfread.c	2008-08-03 11:02:10.000000000 +0200
++++ ./gdb/elfread.c	2008-08-03 11:01:21.000000000 +0200
+@@ -318,7 +318,8 @@ elf_symtab_read (struct objfile *objfile
+ 	  /* Bfd symbols are section relative. */
+ 	  symaddr = sym->value + sym->section->vma;
+ 	  /* Relocate all non-absolute symbols by the section offset.  */
+-	  if (sym->section != &bfd_abs_section)
++	  if (sym->section != &bfd_abs_section
++	    && (sym->section->flags & SEC_THREAD_LOCAL) == 0)
+ 	    {
+ 	      symaddr += offset;
+ 	    }
 Index: gdb-6.8cvs20080219/gdb/testsuite/gdb.dwarf2/dw2-errno.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
diff --git a/gdb.spec b/gdb.spec
index 19d8025..16f2be6 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -16,7 +16,7 @@ Version: 6.8
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 16%{?_with_upstream:.upstream}%{?dist}
+Release: 17%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -795,6 +795,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug  4 2008 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8-17
+- Fix `errno' printing on nonthreaded non-g3 inferiors (TLS minsym is absolute).
+
 * Fri Aug  1 2008 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8-16
 - Remove the `original-location' patch as it has testsuite regressions.