diff --git a/input_tools/iana/tzcode2019a.tar.gz b/input_tools/iana/tzcode2019a.tar.gz
deleted file mode 100644
index b5caf8a..0000000
--- a/input_tools/iana/tzcode2019a.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_tools/iana/tzcode2019a.tar.gz.asc b/input_tools/iana/tzcode2019a.tar.gz.asc
deleted file mode 100644
index 619c705..0000000
--- a/input_tools/iana/tzcode2019a.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlyZs50ACgkQ7ZfpDmKq
-fjRR5xAAqsWv2T1beL9TnJ2JaadySGOZiJg3M3RqW8Vm4Dd0ye8Dz8t+YtDtBX1/
-8+xGdlS7LWjwK2EQC6xWhp0EiqpiFjMU1FRGFeAlAOOv8SE0dPRfP9vIeKzCNXKp
-UwtSrzM5JUX6/iza9UUTlzpwHaEM/gVIfP+sLgT15RJiB84teHro/rpcfOvNRyj1
-bteknySCtbPcETe9VW3qH2YgMRtNQgkt/DcJgCvY2qWLsnicWRH9Ec6NhqYLFpuv
-QwvqC0Odaehrytu+DNhi1wuxt90YHgGHMgIZXtG+kO8eJy2aWFP9zQJ80wVvNqat
-Xgl6T5AU5ZIdBEQkMnk0EhqFlKYFX/81hEWT0gsMBCzteVFhhQQPPyptUwtL5U17
-MX1oVaZbiTbTCqjAjHAJbfW61Fbu9H0wzZhoRLvDqaFfOxQ1HEMh2Ioh+KlJ0nLw
-+l5dLNed7D/kjRE0ja7Jj+ocCl4Hf1DTQknfqtk1USGctWLZ3WfKHk6jCS0vid7g
-IrN6POYhZ6kg4NLF1G2pD7tTiog37Kvd/c3FHC76cqbbA5wkye+L/A73xmy0qOlv
-tp14wxd99ETI5loWgMb5SgRzzeEjNbTrG5AuAOX0qK4Fz3cEdK9/PYYJDSOkueJJ
-0DpP9Eo3Kmhhk7E4PheygmX+Vk+Ntutu7jx8r6EFNck/erZrnJs=
-=kJqF
------END PGP SIGNATURE-----
diff --git a/input_tools/iana/tzcode2021d.tar.gz b/input_tools/iana/tzcode2021d.tar.gz
new file mode 100644
index 0000000..6cd32d6
--- /dev/null
+++ b/input_tools/iana/tzcode2021d.tar.gz
Binary files differ
diff --git a/input_tools/iana/tzcode2021d.tar.gz.asc b/input_tools/iana/tzcode2021d.tar.gz.asc
new file mode 100644
index 0000000..4345131
--- /dev/null
+++ b/input_tools/iana/tzcode2021d.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmFp6ekACgkQ7ZfpDmKq
+fjQtmBAApD1Am4P0gbEECXOABxrnE258QrPRqPhupj45gW0kMD5BehW+yO2oIzOU
+zDmgLbWyG5CmbD2lSt2fq1mZKhfqYD2J4QJlwwiPGHriNKZZCVIQniXZVRFUzQz/
+oObtIzNm5mgR6OUhWDcbzYZsa10eJ7HTMrDOGViZ7T1DyLj5yobSXqkC/Q/ZlEvM
+Vpnl9nDieey2GgXvobfpR+Bby6NB26Pojjab9Mbw9jyRtcvnf6GmdBn6v4aoDwKc
+ZUqcb9qjv7NXnN5o9nCUSK7/ad+RoVZJAVDe84Quj1Vn8ydfZ0/1+i6bF3mM6Bpi
+I3riuPKkv7AHW2iRgZPnnqH7U+X32gb55/+WleokkasZj7e8i1QjJW7L0b91YOHN
+USz1McquYNsh/n9IDph4Zw1tBpbmLYAy3HQPaR6OzO8fc9paw5nsoics/5fQ5WoZ
+2T2EavJfa045XKxwzd57w9YthQgW27Ep6UMpVCEGjYCBfVt8MfmiB787apGJdeJj
+NeVaKfSfpE4PTWvrtfTXPCIVIbIhlA5UUXyhEBXrMJw/FVxf8rAHGi/zvmrgl48X
+iY/xMG4yWpUYwZqWG0NBeGE0tvj8Yj2NagWj/UnGXcte3MvgmjkFSnKhj+UZrcA+
+1ehgE8pGicWEl0xl7uW6uwJ1IgWBMHYIkxpslJdTru+nnfbBIaA=
+=Bvd6
+-----END PGP SIGNATURE-----
diff --git a/input_tools/iana/tzdata2019a.tar.gz b/input_tools/iana/tzdata2019a.tar.gz
deleted file mode 100644
index 8d6c3f7..0000000
--- a/input_tools/iana/tzdata2019a.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_tools/iana/tzdata2019a.tar.gz.asc b/input_tools/iana/tzdata2019a.tar.gz.asc
deleted file mode 100644
index c163977..0000000
--- a/input_tools/iana/tzdata2019a.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlyZs50ACgkQ7ZfpDmKq
-fjTPrg/9HBD7RK0/e2NQc/IEg0BeZPOG/SsWOo78lQ23UVwqXdXqQz9LJXl9gTqM
-ENe8Ecknctk6fmfriAYnSydXx/MwWDbze5nmi4p7wzlogL/ctPILJvQbc/T62fDK
-NpGNwDlaUX/ht7cRG9VO+oun3Zc7efGHJB9UpZDDVZGtq6VT5+AZIryM12XvHfcR
-g0P+0pZfZu9LI4H0K/JUmNnRRXLoq6/5OsV6+hFlTzS7quVfUu+Vb+gsoUVejXld
-77hNvqdAaRBwVW69hjdUL2WJXymQtP/1ZoeOVHskti0HQBFRJsDc4Fhs3Pe5MUWd
-PXVanz/C0sHhHbTLfHs4wVQvNg4g4OP5nl9DyF+KG2SqfuqWOzfbEs5bc8dGqFCk
-HLdj7Nd4eQA8x/Xl6OSukE1yzUR8Xkb9GFgTmpHlP7uq/TH2URJdd/ZXhSgPv+u6
-bM9ghH9eirnVDPxWxsj0bwkZYHY6eJC8pgLPpXsxBY0ktJD/hqS1IMXOAyPRj9fO
-uRt7QLcsJW+wx6Q7ggsgTs7cxnq/Pk55S0lcp63mAu960+2XuBy8ffFJp4J2OwqS
-U6nBCtAZ6ZONKvsoQ4UpIcNfkYEiM3A4XNjn/rL2Jtb0cDA8e0j66/k1vcOc9p6u
-KQSXvSrhoqGTqhKy03XuQJ7LYhSgtD790sxFOXWS59cs/WcLO+M=
-=g5BY
------END PGP SIGNATURE-----
diff --git a/input_tools/iana/tzdata2021d.tar.gz b/input_tools/iana/tzdata2021d.tar.gz
new file mode 100644
index 0000000..1791e04
--- /dev/null
+++ b/input_tools/iana/tzdata2021d.tar.gz
Binary files differ
diff --git a/input_tools/iana/tzdata2021d.tar.gz.asc b/input_tools/iana/tzdata2021d.tar.gz.asc
new file mode 100644
index 0000000..1abfe1e
--- /dev/null
+++ b/input_tools/iana/tzdata2021d.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmFp6ekACgkQ7ZfpDmKq
+fjTbSA/9HBEpib2dXzZg06u4WuVwFEbzu1AUblHm7I9PAzoxtTvJJqH0dMCrHDlj
+wldeHGclbBxLq8wF33Ajh7bvgISDhmjQCm/ux7nS0ctRnPkV4Pj2j6lsfk/gYVIB
+agFefLTTrdHaIrPxZ9TK7c63X+6HMfFDnE+nOrJXimls/gW/Xu/VeMDtngrCIoB3
+JTSbPePbaSlA+NMn+RRhfb6jlw/Slbm7n5Zpf+VSZs2HN4+bNpHuFLbl5oMbPOrQ
+C+va/yKJXrNYroGOfIlz/ZnM24ZGDterLh9BBLe+zy3Ni+dhuH0x406C8zkZXSDu
+U1BZvHK3f84beSF0H1SbkGyjkfVSIol1o2p69mMdcyZzewng3n+MLB8lNxyMkmyk
+f8cTKviE0V+xoEe/yV8+0+uDhli+oLMudqNGy8eCRNgrnRkCsP513LMX73bagohQ
+xjtBd+cp2VSzhV4vXsJJE7mIwzofnZaGqdR/jyHND+4gx80TQo8Ftc29wRGbwCCI
+WU37r17EmcOPg+emOciIf8nYCPnIvKGBBZ0UcCEuvaZXXYhyg+2c82z7A+bIPZaS
+6wQZhqptoWB07tJOMxcgCCV7I1fT8+GLlLLlJQXladooOa06mVzsFk8VlUX4PRl3
+bIQGNgqRtoE/RnhbxgD0A4ToYUqdMvYzcoCGIGpg/4zmyFZWcaY=
+=NgZm
+-----END PGP SIGNATURE-----
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index daf1886..870d634 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
Binary files differ
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index c000f20..e06cc57 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index c81a099..0069c27 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index 12a49ed..98bbd68 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index ad32eb7..93fc801 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test2/output_data/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index 13e2b1b..8fd7a41 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index 38003eb..743bbf8 100644
--- a/testing/data/test3/output_data/distro/distro.zip
+++ b/testing/data/test3/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index 12a49ed..98bbd68 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
Binary files differ
diff --git a/update-tzdata.py b/update-tzdata.py
index 0a86721..373933f 100755
--- a/update-tzdata.py
+++ b/update-tzdata.py
@@ -170,7 +170,7 @@
   print('Calling zic...')
   zic_output_dir = '%s/data' % tmp_dir
   os.mkdir(zic_output_dir)
-  zic_cmd = [zic_binary_file, '-d', zic_output_dir, zic_input_file]
+  zic_cmd = [zic_binary_file, '-b', 'fat', '-d', zic_output_dir, zic_input_file]
   subprocess.check_call(zic_cmd)
 
   # ZoneCompactor