diff --git a/ChangeLog b/ChangeLog
index 5ab7adb99d..f2e166b2e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-11-19  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #14856]
+	* posix/bits/posix1_lim.h [!__USE_XOPEN2K] (_POSIX_TZNAME_MAX):
+	Define to 3.
+
 	* conform/data/errno.h-data [POSIX] (EADDRINUSE): Do not expect.
 	[POSIX] (EADDRNOTAVAIL): Likewise.
 	[POSIX] (EAFNOSUPPORT): Likewise.
diff --git a/NEWS b/NEWS
index 23f1d83fcf..f78758a903 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,7 @@ Version 2.17
   14638, 14645, 14648, 14652, 14660, 14661, 14669, 14672, 14683, 14694,
   14716, 14719, 14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797,
   14801, 14805, 14807, 14809, 14811, 14815, 14821, 14824, 14828, 14831,
-  14835, 14838.
+  14835, 14838, 14856.
 
 * Port to ARM AArch64 contributed by Linaro.
 
diff --git a/posix/bits/posix1_lim.h b/posix/bits/posix1_lim.h
index 5800ef50e0..e7587edcec 100644
--- a/posix/bits/posix1_lim.h
+++ b/posix/bits/posix1_lim.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993,96,98,2000-2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -134,7 +134,11 @@
 #define	_POSIX_TTY_NAME_MAX	9
 
 /* Maximum length of a timezone name (element of `tzname').  */
-#define	_POSIX_TZNAME_MAX	6
+#ifdef __USE_XOPEN2K
+# define _POSIX_TZNAME_MAX	6
+#else
+# define _POSIX_TZNAME_MAX	3
+#endif
 
 #if !defined __USE_XOPEN2K || defined __USE_GNU
 /* Maximum number of connections that can be queued on a socket.  */