diff --git a/sys-libs/timezone_data/patches/timezone_data-2021e.patchset b/sys-libs/timezone_data/patches/timezone_data-2021e.patchset
new file mode 100644
index 000000000..dbb0ac9db
--- /dev/null
+++ b/sys-libs/timezone_data/patches/timezone_data-2021e.patchset
@@ -0,0 +1,52 @@
+From 8cf4e37523a8ec3fc4267c54f5b7c1a83d3227a0 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 24 Feb 2022 18:49:00 +0100
+Subject: applying patch timezone_data-2021e.patch
+
+
+diff --git a/zic.c b/zic.c
+index b70a606..f506bc8 100644
+--- a/zic.c
++++ b/zic.c
+@@ -1138,7 +1138,7 @@ dolink(char const *target, char const *linkname, bool staysymlink)
+ 	    break;
+ 	  }
+ 	  link_errno = errno;
+-	  if (link_errno == EXDEV || link_errno == ENOTSUP)
++         if (link_errno == EXDEV || link_errno == ENOTSUP || link_errno == B_UNSUPPORTED)
+ 	    break;
+ 
+ 	  if (link_errno == EEXIST) {
+@@ -1150,9 +1150,9 @@ dolink(char const *target, char const *linkname, bool staysymlink)
+ 	    mkdirs(linkname, true);
+ 	    linkdirs_made = true;
+ 	  } else {
+-	    fprintf(stderr, _("%s: Can't link %s/%s to %s/%s: %s\n"),
++           fprintf(stderr, _("%s: Can't link %s/%s to %s/%s: %s %x\n"),
+ 		    progname, directory, target, directory, outname,
+-		    strerror(link_errno));
++                   strerror(link_errno), link_errno);
+ 	    exit(EXIT_FAILURE);
+ 	  }
+ 	}
+@@ -1178,7 +1178,7 @@ dolink(char const *target, char const *linkname, bool staysymlink)
+ 	  }
+ 	  free(linkalloc);
+ 	  if (symlink_errno == 0) {
+-	    if (link_errno != ENOTSUP && link_errno != EEXIST)
++           if (link_errno != ENOTSUP && link_errno !=B_UNSUPPORTED && link_errno != EEXIST)
+ 	      warning(_("symbolic link used because hard link failed: %s"),
+ 		      strerror(link_errno));
+ 	  } else {
+@@ -1196,7 +1196,7 @@ dolink(char const *target, char const *linkname, bool staysymlink)
+ 	      putc(c, tp);
+ 	    close_file(tp, directory, linkname, tempname);
+ 	    close_file(fp, directory, target, NULL);
+-	    if (link_errno != ENOTSUP)
++           if (link_errno != ENOTSUP && link_errno != B_UNSUPPORTED)
+ 	      warning(_("copy used because hard link failed: %s"),
+ 		      strerror(link_errno));
+ 	    else if (symlink_errno != ENOTSUP)
+-- 
+2.30.2
+
diff --git a/sys-libs/timezone_data/timezone_data-2021a.recipe b/sys-libs/timezone_data/timezone_data-2021e.recipe
similarity index 80%
rename from sys-libs/timezone_data/timezone_data-2021a.recipe
rename to sys-libs/timezone_data/timezone_data-2021e.recipe
index 08daff57c..211b6494d 100644
--- a/sys-libs/timezone_data/timezone_data-2021a.recipe
+++ b/sys-libs/timezone_data/timezone_data-2021e.recipe
@@ -6,15 +6,16 @@ reflect changes made by political bodies to time zone boundaries, \
 UTC offsets, and daylight-saving rules. Its management procedure is \
 documented in BCP 175: Procedures for Maintaining the Time Zone Database."
 HOMEPAGE="https://www.iana.org/time-zones"
-COPYRIGHT="2020 Arthur David Olson"
+COPYRIGHT="2020-2021 Arthur David Olson"
 LICENSE="
 	Public Domain
 	BSD (3-clause)
 	"
 REVISION="1"
 SOURCE_URI="https://data.iana.org/time-zones/releases/tzdb-$portVersion.tar.lz"
-CHECKSUM_SHA256="21bf125de7b0c486cb57f1ba61b39584c949b2e6cac0a03a6425435d9bff37d0"
+CHECKSUM_SHA256="a3f98ee8bd76d58e3fbb20a9f55551c70b776ef5d145b9b866fc6c7a98f97416"
 SOURCE_DIR="tzdb-$portVersion"
+PATCHES="timezone_data-$portVersion.patchset"
 
 ARCHITECTURES="all"
 
@@ -47,9 +48,10 @@ BUILD()
 
 INSTALL()
 {
+	mkdir -p $dataDir/zoneinfo $dataDir/zoneinfo-leaps
 	make \
 		USRDIR=$prefix \
-		USRSHAREDIR=$dataDir \
+		USRSHAREDIR=${dataDir:1} \
 		ZICDIR=$binDir \
 		MANDIR=$manDir \
 		install