diff --git a/devel/estd/Makefile b/devel/estd/Makefile
index f6969b1c71ce..e6af294b44ca 100644
--- a/devel/estd/Makefile
+++ b/devel/estd/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	estd
-DISTVERSION=	0.4.0
+DISTVERSION=	0.6.4
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Header-only C++ utilities in the style of the standard library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	catch>0:devel/catch
 RUN_DEPENDS=	catch>0:devel/catch
 
 USES=		cmake compiler:c++17-lang localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	fizyr
 
 NO_ARCH=	yes
 
-do-test:
+do-test: # tests fail to compile: https://github.com/fizyr/estd/issues/12
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check
 
 .include <bsd.port.mk>
diff --git a/devel/estd/distinfo b/devel/estd/distinfo
index 538a48d0bcc0..7cc3f3adde7e 100644
--- a/devel/estd/distinfo
+++ b/devel/estd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599111895
-SHA256 (fizyr-estd-0.4.0_GH0.tar.gz) = ec90cedbb84344380adbdc98c963e8a857b51e2cc152f9bf3c1658eff2e5a051
-SIZE (fizyr-estd-0.4.0_GH0.tar.gz) = 48259
+TIMESTAMP = 1651545818
+SHA256 (fizyr-estd-0.6.4_GH0.tar.gz) = dc7c3daf6ef9eb0870b6f96a9ea2183e4b04b2dd91da194c3f5c1587f91c439c
+SIZE (fizyr-estd-0.6.4_GH0.tar.gz) = 49723
diff --git a/devel/estd/pkg-plist b/devel/estd/pkg-plist
index 56d94feb8ce4..ea305883fd9f 100644
--- a/devel/estd/pkg-plist
+++ b/devel/estd/pkg-plist
@@ -1,73 +1,75 @@
 include/estd/any.hpp
 include/estd/any/any.hpp
+include/estd/array.hpp
+include/estd/array/initialize.hpp
 include/estd/convert.hpp
 include/estd/convert/conversion.hpp
 include/estd/convert/convert.hpp
 include/estd/convert/numerical.hpp
 include/estd/convert/stl.hpp
 include/estd/convert/stl/array.hpp
 include/estd/convert/stl/deque.hpp
 include/estd/convert/stl/forward_list.hpp
 include/estd/convert/stl/list.hpp
 include/estd/convert/stl/map.hpp
 include/estd/convert/stl/set.hpp
 include/estd/convert/stl/unordered_map.hpp
 include/estd/convert/stl/unordered_set.hpp
 include/estd/convert/stl/vector.hpp
 include/estd/convert/traits.hpp
 include/estd/heap_array.hpp
 include/estd/heap_array/heap_array.hpp
 include/estd/range.hpp
 include/estd/range/detail/deref_proxy.hpp
 include/estd/range/enumerate.hpp
 include/estd/range/range.hpp
 include/estd/result.hpp
 include/estd/result/catch_string_conversions.hpp
 include/estd/result/detail/copyable.hpp
 include/estd/result/detail/map.hpp
 include/estd/result/detail/result_storage.hpp
 include/estd/result/error.hpp
 include/estd/result/in_place.hpp
 include/estd/result/result.hpp
 include/estd/result/traits.hpp
 include/estd/result/unspecified_category.hpp
 include/estd/scope_guard.hpp
 include/estd/scope_guard/scope_guard.hpp
 include/estd/traits.hpp
 include/estd/traits/containers.hpp
 include/estd/traits/decay_if.hpp
 include/estd/traits/is_comparible.hpp
 include/estd/traits/is_integer_sequence.hpp
 include/estd/traits/is_tuple.hpp
 include/estd/traits/iterator.hpp
 include/estd/traits/replace_type.hpp
 include/estd/traits/type_traits.hpp
 include/estd/tuple.hpp
 include/estd/tuple/fold.hpp
 include/estd/tuple/for_each.hpp
 include/estd/tuple/transform.hpp
 include/estd/tuple/tuple.hpp
 include/estd/tuple/zip.hpp
 include/estd/type_name.hpp
 include/estd/type_name/demangle.hpp
 include/estd/type_name/std.hpp
 include/estd/type_name/std/containers.hpp
 include/estd/type_name/std/containers/array.hpp
 include/estd/type_name/std/containers/deque.hpp
 include/estd/type_name/std/containers/forward_list.hpp
 include/estd/type_name/std/containers/list.hpp
 include/estd/type_name/std/containers/map.hpp
 include/estd/type_name/std/containers/set.hpp
 include/estd/type_name/std/containers/string.hpp
 include/estd/type_name/std/containers/vector.hpp
 include/estd/type_name/type_name.hpp
 include/estd/utility.hpp
 include/estd/utility/integer_sequence.hpp
 include/estd/utility/make_ref.hpp
 include/estd/utility/move_marker.hpp
 include/estd/utility/parameter_pack.hpp
 include/estd/view.hpp
 include/estd/view/view.hpp
 lib/cmake/estd/estd-config-version.cmake
 lib/cmake/estd/estd-config.cmake
 lib/cmake/estd/targets.cmake