diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index e58273000..935173cd7 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-05  Václav Zeman  <vhaisman@gmail.com>
+
+	* tzmap-from-unicode.org: Create tzmap as const.
+	* tzmap.h: Regenerate.
+
 2014-12-05  Corinna Vinschen  <corinna@vinschen.de>
 
 	* Makefile.in: Add rules to create and depend on tzmap.h.
diff --git a/winsup/utils/tzmap-from-unicode.org b/winsup/utils/tzmap-from-unicode.org
index 9e713c3b2..a155312a8 100755
--- a/winsup/utils/tzmap-from-unicode.org
+++ b/winsup/utils/tzmap-from-unicode.org
@@ -59,7 +59,7 @@ echo "{"
 echo "  PCWSTR win_tzkey;"
 echo "  PCWSTR country;"
 echo "  PCWSTR posix_tzid;"
-echo "} tzmap[] ="
+echo "} const tzmap[] ="
 echo "{"
 wget -O - "${ZONES_FILE}" | \
 {
diff --git a/winsup/utils/tzmap.h b/winsup/utils/tzmap.h
index d63d506c3..dd4f8c0e4 100644
--- a/winsup/utils/tzmap.h
+++ b/winsup/utils/tzmap.h
@@ -47,7 +47,7 @@ struct
   PCWSTR win_tzkey;
   PCWSTR country;
   PCWSTR posix_tzid;
-} tzmap[] =
+} const tzmap[] =
 {
   { L"AUS Central Standard Time", L"", L"Australia/Darwin" },
   { L"AUS Central Standard Time", L"AU", L"Australia/Darwin" },