diff --git a/devel/mdds/Makefile b/devel/mdds/Makefile
index c521cead3855..88beda64a5f4 100644
--- a/devel/mdds/Makefile
+++ b/devel/mdds/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	mdds
-PORTVERSION=	1.7.0
+PORTVERSION=	2.0.1
 CATEGORIES=	devel
 MASTER_SITES=	https://kohei.us/files/mdds/src/
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Multi-dimensional data index algorithm
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		tar:bzip2
+USES=		tar:xz
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_SUB=	API_VERSION=${API_VERSION}
 
 API_VERSION=	${PORTVERSION:R}
 
 do-configure:
 	@${SED} -e 's|@API_VERSION@|${API_VERSION}|' \
 	    -e 's|@VERSION@|${PORTVERSION}|' \
 	    -e 's|@includedir@|$${prefix}/include|' \
 	    -e 's|@prefix@|${PREFIX}|' \
 	    ${WRKSRC}/misc/mdds.pc.in > \
 	    ${WRKSRC}/misc/mdds-${API_VERSION}.pc
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/mdds-${API_VERSION}/mdds
 	(cd ${WRKSRC}/include && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${PREFIX}/include/mdds-${API_VERSION})
 	${FIND} ${STAGEDIR}${PREFIX}/include/mdds-${API_VERSION} \
 	    \( -name "*.orig" -or -name "Makefile.*" \) -delete
 	${INSTALL_DATA} ${WRKSRC}/misc/mdds-${API_VERSION}.pc \
 	    ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
 .include <bsd.port.mk>
diff --git a/devel/mdds/distinfo b/devel/mdds/distinfo
index 23caa391e47f..783b3fab6076 100644
--- a/devel/mdds/distinfo
+++ b/devel/mdds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609865119
-SHA256 (mdds-1.7.0.tar.bz2) = a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf
-SIZE (mdds-1.7.0.tar.bz2) = 363514
+TIMESTAMP = 1640203723
+SHA256 (mdds-2.0.1.tar.xz) = 05e71772e34da303f2d1a5a5ec0851187b50797dca3a9a40222555b77242c48a
+SIZE (mdds-2.0.1.tar.xz) = 410600
diff --git a/devel/mdds/pkg-plist b/devel/mdds/pkg-plist
index 1f7324145bf8..04f818a0ab55 100644
--- a/devel/mdds/pkg-plist
+++ b/devel/mdds/pkg-plist
@@ -1,33 +1,46 @@
 include/mdds-%%API_VERSION%%/mdds/flat_segment_tree.hpp
 include/mdds-%%API_VERSION%%/mdds/flat_segment_tree_def.inl
 include/mdds-%%API_VERSION%%/mdds/flat_segment_tree_itr.hpp
 include/mdds-%%API_VERSION%%/mdds/global.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_matrix.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_matrix_def.inl
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/aos/block_util.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/aos/iterator.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/aos/main.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/aos/main_def.inl
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector/collection.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector/collection_def.inl
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/custom_func1.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/custom_func2.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/custom_func3.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/iterator_node.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/macro.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/soa/block_util.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/soa/iterator.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/soa/main.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/soa/main_def.inl
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/trait.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/types.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/util.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector_custom_func1.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector_custom_func2.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector_custom_func3.hpp
-include/mdds-%%API_VERSION%%/mdds/multi_type_vector_def.inl
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector_itr.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector_macro.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector_trait.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector_types.hpp
 include/mdds-%%API_VERSION%%/mdds/node.hpp
 include/mdds-%%API_VERSION%%/mdds/point_quad_tree.hpp
 include/mdds-%%API_VERSION%%/mdds/quad_node.hpp
-include/mdds-%%API_VERSION%%/mdds/rectangle_set.hpp
-include/mdds-%%API_VERSION%%/mdds/rectangle_set_def.inl
 include/mdds-%%API_VERSION%%/mdds/ref_pair.hpp
 include/mdds-%%API_VERSION%%/mdds/rtree.hpp
 include/mdds-%%API_VERSION%%/mdds/rtree_def.inl
 include/mdds-%%API_VERSION%%/mdds/segment_tree.hpp
 include/mdds-%%API_VERSION%%/mdds/segment_tree_def.inl
 include/mdds-%%API_VERSION%%/mdds/sorted_string_map.hpp
 include/mdds-%%API_VERSION%%/mdds/sorted_string_map_def.inl
 include/mdds-%%API_VERSION%%/mdds/trie_map.hpp
 include/mdds-%%API_VERSION%%/mdds/trie_map_def.inl
 include/mdds-%%API_VERSION%%/mdds/trie_map_itr.hpp
 libdata/pkgconfig/mdds-%%API_VERSION%%.pc