diff --git a/sysutils/openseachest/Makefile b/sysutils/openseachest/Makefile
index 6131f4764dac..6c7b6243bd09 100644
--- a/sysutils/openseachest/Makefile
+++ b/sysutils/openseachest/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	openseachest
-PORTVERSION=	21.03.01
+PORTVERSION=	21.06.21
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Utilities for managing storage devices
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-USES=		gmake
+USES=		dos2unix gmake
 ALL_TARGET=	release
 
+DOS2UNIX_FILES=	src/openseachest_util_options.c
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Seagate
 GH_PROJECT=	openSeaChest
-GH_TUPLE=	Seagate:opensea-common:1df13e2:common/opensea-common \
-		Seagate:opensea-operations:2dd600a:operations/opensea-operations \
-		Seagate:opensea-transport:0d04cf7:transport/opensea-transport \
+GH_TUPLE=	Seagate:opensea-common:dc89150:common/opensea-common \
+		Seagate:opensea-operations:cfd7678:operations/opensea-operations \
+		Seagate:opensea-transport:a2ea73c:transport/opensea-transport \
 		Seagate:wingetopt:1b5b5ad:wingetopt/wingetopt
-
 BUILD_WRKSRC=	${WRKSRC}/Make/gcc
 INSTALL_WRKSRC=	${WRKSRC}/Make/gcc
 CFLAGS+=	-Wall -c -std=gnu99
 MAKE_JOBS_UNSAFE=	yes
 EXES=		openSeaChest_Basics openSeaChest_Configure openSeaChest_Erase \
 		openSeaChest_Firmware openSeaChest_FormatUnit \
 		openSeaChest_GenericTests openSeaChest_Info openSeaChest_Logs \
 		openSeaChest_NVMe openSeaChest_PassthroughTest \
 		openSeaChest_PowerControl openSeaChest_Security \
 		openSeaChest_SMART openSeaChest_ZBD
 .for file in ${EXES}
 PLIST_FILES+=	bin/${file}
 .endfor
 
 .include <bsd.port.pre.mk>
 
 do-install:
 .for exefile in ${EXES}
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/openseachest_exes/${exefile} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/openseachest/distinfo b/sysutils/openseachest/distinfo
index b6b6c9fc769d..ad9120ceec01 100644
--- a/sysutils/openseachest/distinfo
+++ b/sysutils/openseachest/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1614640495
-SHA256 (Seagate-openSeaChest-v21.03.01_GH0.tar.gz) = 6ff65f6688329f3c3d801c4a3d6e8257891cd22ab93dddbd3d6ba1a2e30d3794
-SIZE (Seagate-openSeaChest-v21.03.01_GH0.tar.gz) = 718835
-SHA256 (Seagate-opensea-common-1df13e2_GH0.tar.gz) = 157859fd9ad4b3dd344c105c0bc5b5f5face6180d89433ec6a75533f2d9710fc
-SIZE (Seagate-opensea-common-1df13e2_GH0.tar.gz) = 108483
-SHA256 (Seagate-opensea-operations-2dd600a_GH0.tar.gz) = 2b1c9917b299db9f44506dd24b5678341c98a88761e7c3a355521260e9586c63
-SIZE (Seagate-opensea-operations-2dd600a_GH0.tar.gz) = 413161
-SHA256 (Seagate-opensea-transport-0d04cf7_GH0.tar.gz) = 349b47154f1727b36c3c758c00c7378371fe9403d35746360d54387d3e10fb5c
-SIZE (Seagate-opensea-transport-0d04cf7_GH0.tar.gz) = 696368
+TIMESTAMP = 1630345993
+SHA256 (Seagate-openSeaChest-v21.06.21_GH0.tar.gz) = ab9b458b8389d1a36b9703fd97ac4e4b8d157c028b8ee28315ff96541cc45956
+SIZE (Seagate-openSeaChest-v21.06.21_GH0.tar.gz) = 728115
+SHA256 (Seagate-opensea-common-dc89150_GH0.tar.gz) = 97b6d9dbc1b1ed489a63becc26c2da4ce24aa5a824525e344dd9702db3b021c9
+SIZE (Seagate-opensea-common-dc89150_GH0.tar.gz) = 111481
+SHA256 (Seagate-opensea-operations-cfd7678_GH0.tar.gz) = 297f642bea96ce18fd1380183525983f62d160347868af0b678d8757d5a18aa6
+SIZE (Seagate-opensea-operations-cfd7678_GH0.tar.gz) = 423225
+SHA256 (Seagate-opensea-transport-a2ea73c_GH0.tar.gz) = 1dba2ffb45cd4266600aab151613dbdc8a850a286ff1fa5de7dedfc4b8c9c251
+SIZE (Seagate-opensea-transport-a2ea73c_GH0.tar.gz) = 705111
 SHA256 (Seagate-wingetopt-1b5b5ad_GH0.tar.gz) = 33457d93e768e9e877a84004e8f2d9a597fabe706855d4d18b10d60c650e24b8
 SIZE (Seagate-wingetopt-1b5b5ad_GH0.tar.gz) = 15515
diff --git a/sysutils/openseachest/files/patch-src_openseachest__util__options.c b/sysutils/openseachest/files/patch-src_openseachest__util__options.c
new file mode 100644
index 000000000000..13c7b0bd4dc8
--- /dev/null
+++ b/sysutils/openseachest/files/patch-src_openseachest__util__options.c
@@ -0,0 +1,38 @@
+--- src/openseachest_util_options.c.orig	2021-05-21 17:50:44 UTC
++++ src/openseachest_util_options.c
+@@ -108,12 +108,12 @@ void print_Elevated_Privileges_Text()
+ 
+ char* get_current_year(char *temp_year)
+ {
+-    size_t len = strlen(__DATE__);
++    size_t len = strlen("Jan 19 2038");
+     temp_year[4] = '\0';
+-    temp_year[3] = __DATE__[len - 1];
+-    temp_year[2] = __DATE__[len - 2];
+-    temp_year[1] = __DATE__[len - 3];
+-    temp_year[0] = __DATE__[len - 4];
++    temp_year[3] = "Jan 19 2038"[len - 1];
++    temp_year[2] = "Jan 19 2038"[len - 2];
++    temp_year[1] = "Jan 19 2038"[len - 3];
++    temp_year[0] = "Jan 19 2038"[len - 4];
+     return temp_year;
+ }
+ 
+@@ -147,7 +147,7 @@ void openseachest_utility_Info(const char *utilityName
+     printf(" %s Version: %s-%s ", utilityName, buildVersion, seaCPublicVersion);
+     print_Architecture(architecture);
+     printf("\n");
+-    printf(" Build Date: %s\n", __DATE__);
++    printf(" Build Date: %s\n", "Jan 19 2038");
+     if (0 == strftime(currentTime, 30, "%c", get_Localtime(&g_curTime, &utilTime)))
+     {
+         sprintf(currentTime, "Unable to get local time");
+@@ -174,7 +174,7 @@ void utility_Full_Version_Info(const char *utilityName
+     printf("\topensea-common Version: %s\n", openseaCommonVersion);
+     printf("\topensea-transport Version: %" PRId32".%" PRId32".%" PRId32"\n", seaCPublicMajorVersion, seaCPublicMinorVersion, seaCPublicPatchVersion);
+     printf("\topensea-operations Version: %s\n", openseaOperationVersion);
+-    printf("\tBuild Date: %s\n", __DATE__);
++    printf("\tBuild Date: %s\n", "Jan 19 2038");
+     printf("\tCompiled Architecture: ");
+     print_Architecture(get_Compiled_Architecture());
+     printf("\n\tDetected Endianness: ");