diff --git a/testdata/README.zoneinfo b/testdata/README.zoneinfo
index 38b59601..36b39db6 100644
--- a/testdata/README.zoneinfo
+++ b/testdata/README.zoneinfo
@@ -8,6 +8,7 @@ already be found in the default ${TZDIR} location, /usr/share/zoneinfo.
 New versions can be generated using the following shell script.
 
   #!/bin/sh -
+  set -e
   DESTDIR=$(mktemp -d)
   trap "rm -fr ${DESTDIR}" 0 2 15
   (
@@ -20,8 +21,9 @@ New versions can be generated using the following shell script.
                 LOCALTIME=Factory \
                 TZDATA_TEXT= \
                 ZONETABLES=zone1970.tab
-    rm zoneinfo/posixrules
-    tar --create --dereference --hard-dereference --file zoneinfo.tar zoneinfo
+    tar --create --dereference --hard-dereference --file zoneinfo.tar \
+        --exclude=zoneinfo/posixrules zoneinfo \
+        --directory=tz version
   )
   tar --extract --directory testdata --file ${DESTDIR}/zoneinfo.tar
   exit 0
diff --git a/testdata/version b/testdata/version
new file mode 100644
index 00000000..2b0599d3
--- /dev/null
+++ b/testdata/version
@@ -0,0 +1 @@
+2018c-2-gec1c7bf
diff --git a/testdata/zoneinfo/Africa/Sao_Tome b/testdata/zoneinfo/Africa/Sao_Tome
index 6fd1af32..3c0d33b0 100644
Binary files a/testdata/zoneinfo/Africa/Sao_Tome and b/testdata/zoneinfo/Africa/Sao_Tome differ
diff --git a/testdata/zoneinfo/America/Campo_Grande b/testdata/zoneinfo/America/Campo_Grande
index 58c56a84..de52bb68 100644
Binary files a/testdata/zoneinfo/America/Campo_Grande and b/testdata/zoneinfo/America/Campo_Grande differ
diff --git a/testdata/zoneinfo/America/Cuiaba b/testdata/zoneinfo/America/Cuiaba
index 6d45d512..145c89e0 100644
Binary files a/testdata/zoneinfo/America/Cuiaba and b/testdata/zoneinfo/America/Cuiaba differ
diff --git a/testdata/zoneinfo/America/La_Paz b/testdata/zoneinfo/America/La_Paz
index e83068b1..bc3df523 100644
Binary files a/testdata/zoneinfo/America/La_Paz and b/testdata/zoneinfo/America/La_Paz differ
diff --git a/testdata/zoneinfo/America/Sao_Paulo b/testdata/zoneinfo/America/Sao_Paulo
index 62dcd7bc..308a545c 100644
Binary files a/testdata/zoneinfo/America/Sao_Paulo and b/testdata/zoneinfo/America/Sao_Paulo differ
diff --git a/testdata/zoneinfo/Asia/Tokyo b/testdata/zoneinfo/Asia/Tokyo
index 931baf22..8ad44ba9 100644
Binary files a/testdata/zoneinfo/Asia/Tokyo and b/testdata/zoneinfo/Asia/Tokyo differ
diff --git a/testdata/zoneinfo/Brazil/East b/testdata/zoneinfo/Brazil/East
index 62dcd7bc..308a545c 100644
Binary files a/testdata/zoneinfo/Brazil/East and b/testdata/zoneinfo/Brazil/East differ
diff --git a/testdata/zoneinfo/Japan b/testdata/zoneinfo/Japan
index 931baf22..8ad44ba9 100644
Binary files a/testdata/zoneinfo/Japan and b/testdata/zoneinfo/Japan differ
diff --git a/testdata/zoneinfo/zone1970.tab b/testdata/zoneinfo/zone1970.tab
index 455e7976..4ee8ce51 100644
--- a/testdata/zoneinfo/zone1970.tab
+++ b/testdata/zoneinfo/zone1970.tab
@@ -132,7 +132,7 @@ CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
 CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
 CC	-1210+09655	Indian/Cocos
 CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
-CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+CI,BF,GM,GN,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
 CL	-3327-07040	America/Santiago	Chile (most areas)
 CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
@@ -321,6 +321,7 @@ SE	+5920+01803	Europe/Stockholm
 SG	+0117+10351	Asia/Singapore
 SR	+0550-05510	America/Paramaribo
 SS	+0451+03137	Africa/Juba
+ST	+0020+00644	Africa/Sao_Tome
 SV	+1342-08912	America/El_Salvador
 SY	+3330+03618	Asia/Damascus
 TC	+2128-07108	America/Grand_Turk