diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes
index 0ad0a2d..78d4726 100644
--- a/glibc-testsuite.changes
+++ b/glibc-testsuite.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 23 10:33:40 UTC 2014 - schwab@suse.de
+
+- nss-files-long-lines.patch: Don't ignore too long lines in nss_files
+  (bnc#883217, BZ #17079)
+- Remove locale.1, localedef.1 and iconvconfig.8 manpages, now included in
+  the man-pages package (bnc#880703)
+- manpages.patch: update
+
 -------------------------------------------------------------------
 Mon Jun 16 08:27:38 UTC 2014 - schwab@suse.de
 
diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec
index 2b5fe93..3a4bf4b 100644
--- a/glibc-testsuite.spec
+++ b/glibc-testsuite.spec
@@ -258,6 +258,8 @@ Patch1011:      aarch64-setcontext.patch
 Patch1012:      nss-nis-stack-use.patch
 # PATCH-FIX-UPSTREAM posix_spawn_file_actions_addopen needs to copy the path argument (BZ #17048)
 Patch1013:      psfaa.patch
+# PATCH-FIX-UPSTREAM Don't ignore too long lines in nss_files (BZ #17079)
+Patch1014:      nss-files-long-lines.patch
 
 ### 
 # Patches awaiting upstream approval
@@ -488,6 +490,7 @@ rm nscd/s-stamp
 %patch1011 -p1
 %patch1012 -p1
 %patch1013 -p1
+%patch1014 -p1
 
 %patch2000 -p1
 %patch2001 -p1
@@ -1089,10 +1092,7 @@ exit 0
 %config(noreplace) /etc/default/nss
 %doc %{_mandir}/man1/gencat.1.gz
 %doc %{_mandir}/man1/getconf.1.gz
-%doc %{_mandir}/man1/locale.1.gz
-%doc %{_mandir}/man1/localedef.1.gz
 %doc %{_mandir}/man5/*
-%doc %{_mandir}/man8/iconvconfig.8.gz
 /%{_lib}/ld-%{glibc_major_version}.so
 
 # Each architecture has a different name for the dynamic linker:
diff --git a/glibc-utils.changes b/glibc-utils.changes
index 0ad0a2d..78d4726 100644
--- a/glibc-utils.changes
+++ b/glibc-utils.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 23 10:33:40 UTC 2014 - schwab@suse.de
+
+- nss-files-long-lines.patch: Don't ignore too long lines in nss_files
+  (bnc#883217, BZ #17079)
+- Remove locale.1, localedef.1 and iconvconfig.8 manpages, now included in
+  the man-pages package (bnc#880703)
+- manpages.patch: update
+
 -------------------------------------------------------------------
 Mon Jun 16 08:27:38 UTC 2014 - schwab@suse.de
 
diff --git a/glibc-utils.spec b/glibc-utils.spec
index 6acdd36..5758ee1 100644
--- a/glibc-utils.spec
+++ b/glibc-utils.spec
@@ -257,6 +257,8 @@ Patch1011:      aarch64-setcontext.patch
 Patch1012:      nss-nis-stack-use.patch
 # PATCH-FIX-UPSTREAM posix_spawn_file_actions_addopen needs to copy the path argument (BZ #17048)
 Patch1013:      psfaa.patch
+# PATCH-FIX-UPSTREAM Don't ignore too long lines in nss_files (BZ #17079)
+Patch1014:      nss-files-long-lines.patch
 
 ### 
 # Patches awaiting upstream approval
@@ -488,6 +490,7 @@ rm nscd/s-stamp
 %patch1011 -p1
 %patch1012 -p1
 %patch1013 -p1
+%patch1014 -p1
 
 %patch2000 -p1
 %patch2001 -p1
@@ -1089,10 +1092,7 @@ exit 0
 %config(noreplace) /etc/default/nss
 %doc %{_mandir}/man1/gencat.1.gz
 %doc %{_mandir}/man1/getconf.1.gz
-%doc %{_mandir}/man1/locale.1.gz
-%doc %{_mandir}/man1/localedef.1.gz
 %doc %{_mandir}/man5/*
-%doc %{_mandir}/man8/iconvconfig.8.gz
 /%{_lib}/ld-%{glibc_major_version}.so
 
 # Each architecture has a different name for the dynamic linker:
diff --git a/glibc.changes b/glibc.changes
index 0ad0a2d..78d4726 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 23 10:33:40 UTC 2014 - schwab@suse.de
+
+- nss-files-long-lines.patch: Don't ignore too long lines in nss_files
+  (bnc#883217, BZ #17079)
+- Remove locale.1, localedef.1 and iconvconfig.8 manpages, now included in
+  the man-pages package (bnc#880703)
+- manpages.patch: update
+
 -------------------------------------------------------------------
 Mon Jun 16 08:27:38 UTC 2014 - schwab@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index a4f6b26..b5414d2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -258,6 +258,8 @@ Patch1011:      aarch64-setcontext.patch
 Patch1012:      nss-nis-stack-use.patch
 # PATCH-FIX-UPSTREAM posix_spawn_file_actions_addopen needs to copy the path argument (BZ #17048)
 Patch1013:      psfaa.patch
+# PATCH-FIX-UPSTREAM Don't ignore too long lines in nss_files (BZ #17079)
+Patch1014:      nss-files-long-lines.patch
 
 ### 
 # Patches awaiting upstream approval
@@ -488,6 +490,7 @@ rm nscd/s-stamp
 %patch1011 -p1
 %patch1012 -p1
 %patch1013 -p1
+%patch1014 -p1
 
 %patch2000 -p1
 %patch2001 -p1
@@ -1089,10 +1092,7 @@ exit 0
 %config(noreplace) /etc/default/nss
 %doc %{_mandir}/man1/gencat.1.gz
 %doc %{_mandir}/man1/getconf.1.gz
-%doc %{_mandir}/man1/locale.1.gz
-%doc %{_mandir}/man1/localedef.1.gz
 %doc %{_mandir}/man5/*
-%doc %{_mandir}/man8/iconvconfig.8.gz
 /%{_lib}/ld-%{glibc_major_version}.so
 
 # Each architecture has a different name for the dynamic linker:
diff --git a/manpages.patch b/manpages.patch
index 504238f..b26eab0 100644
--- a/manpages.patch
+++ b/manpages.patch
@@ -1,25 +1,3 @@
-Index: manpages/locale.1
-===================================================================
---- manpages/locale.1.orig
-+++ manpages/locale.1
-@@ -247,17 +247,6 @@ This environment variable can switch aga
- \&        The directory where locale data is stored.  By default, /usr/lib/locale is used.
- .Ve
- 
--.SH "FILES"
--.IX Header "FILES"
--.PP
--.PD 0
--.TP 8
--\fI/usr/share/i18n/SUPPORTED\fP
--List of supported values (and their associated encoding) for the locale name.
--This representation is recommended over
--\fB\-\-all\-locales\fR one, due being the system wide supported values.
--.PP
--
- .SH "AUTHOR"
- .IX Header "AUTHOR"
- \&\fIlocale\fR was written by Ulrich Drepper for the \s-1GNU\s0 C Library.
 Index: manpages/locale.alias.5
 ===================================================================
 --- manpages/locale.alias.5.orig
diff --git a/manpages.tar.bz2 b/manpages.tar.bz2
index bcc007b..7f16f69 100644
--- a/manpages.tar.bz2
+++ b/manpages.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19a74b49f1afe63adb4e79accb214e2ed77d74af7ca0054af31322d64f3e14f1
-size 15972
+oid sha256:f05635b9beaec8379f31f0f0bc4ce2382b4ba734e97319ae37077e1eaa97f826
+size 11861
diff --git a/nss-files-long-lines.patch b/nss-files-long-lines.patch
new file mode 100644
index 0000000..ad1e169
--- /dev/null
+++ b/nss-files-long-lines.patch
@@ -0,0 +1,24 @@
+2014-06-23  Andreas Schwab  <schwab@suse.de>
+
+	[BZ #17079]
+	* nss/nss_files/files-XXX.c (get_contents): Store overflow marker
+	before reading the next line.
+
+Index: glibc-2.19/nss/nss_files/files-XXX.c
+===================================================================
+--- glibc-2.19.orig/nss/nss_files/files-XXX.c
++++ glibc-2.19/nss/nss_files/files-XXX.c
+@@ -198,10 +198,12 @@ get_contents (char *linebuf, size_t len,
+     {
+       int curlen = ((remaining_len > (size_t) INT_MAX) ? INT_MAX
+ 		    : remaining_len);
+-      char *p = fgets_unlocked (curbuf, curlen, stream);
+ 
++      /* Terminate the line so that we can test for overflow.  */
+       ((unsigned char *) curbuf)[curlen - 1] = 0xff;
+ 
++      char *p = fgets_unlocked (curbuf, curlen, stream);
++
+       /* EOF or read error.  */
+       if (p == NULL)
+         return gcr_error;