diff --git a/devel/mdds/Makefile b/devel/mdds/Makefile
index 51565c6bd2cf..78243306af05 100644
--- a/devel/mdds/Makefile
+++ b/devel/mdds/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	mdds
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.1
 CATEGORIES=	devel
 MASTER_SITES=	https://kohei.us/files/mdds/src/
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Multi-dimensional data index algorithm
 WWW=		https://gitlab.com/mdds/mdds
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 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 26b218f99fe6..0e9ccd46305c 100644
--- a/devel/mdds/distinfo
+++ b/devel/mdds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652734212
-SHA256 (mdds-2.0.3.tar.xz) = 6c01cdbd7f662a7adee5a6879d31130815fd31048d940f1b780ed67b719fc8e4
-SIZE (mdds-2.0.3.tar.xz) = 419884
+TIMESTAMP = 1683410870
+SHA256 (mdds-2.1.1.tar.xz) = 1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56
+SIZE (mdds-2.1.1.tar.xz) = 540732
diff --git a/devel/mdds/pkg-plist b/devel/mdds/pkg-plist
index 04f818a0ab55..cf81e2ee9cc1 100644
--- a/devel/mdds/pkg-plist
+++ b/devel/mdds/pkg-plist
@@ -1,46 +1,42 @@
-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/flat_segment_tree.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_matrix.hpp
+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_types.hpp
 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/aos/main.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/block_funcs.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/collection.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/env.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/soa/main.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/standard_element_blocks.hpp
+include/mdds-%%API_VERSION%%/mdds/multi_type_vector/types_util.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_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/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/rtree.hpp
 include/mdds-%%API_VERSION%%/mdds/segment_tree_def.inl
-include/mdds-%%API_VERSION%%/mdds/sorted_string_map.hpp
+include/mdds-%%API_VERSION%%/mdds/segment_tree.hpp
 include/mdds-%%API_VERSION%%/mdds/sorted_string_map_def.inl
-include/mdds-%%API_VERSION%%/mdds/trie_map.hpp
+include/mdds-%%API_VERSION%%/mdds/sorted_string_map.hpp
 include/mdds-%%API_VERSION%%/mdds/trie_map_def.inl
 include/mdds-%%API_VERSION%%/mdds/trie_map_itr.hpp
+include/mdds-%%API_VERSION%%/mdds/trie_map.hpp
 libdata/pkgconfig/mdds-%%API_VERSION%%.pc