diff --git a/devel/mdds/Makefile b/devel/mdds/Makefile
index 6d0238fa81fc..2817bc1e3d4d 100644
--- a/devel/mdds/Makefile
+++ b/devel/mdds/Makefile
@@ -1,42 +1,22 @@
 PORTNAME=	mdds
-PORTVERSION=	3.1.0
+PORTVERSION=	3.2.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
+USES=		autoreconf gmake pkgconfig tar:xz
+GNU_CONFIGURE=	yes
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	mdds
 
-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
+PLIST_SUB=	API_VERSION=${MDDS_API_VERSION}
+.include "${.CURDIR}/../../devel/mdds/Makefile.version"
 
 .include <bsd.port.mk>
diff --git a/devel/mdds/Makefile.version b/devel/mdds/Makefile.version
new file mode 100644
index 000000000000..e92b996faaed
--- /dev/null
+++ b/devel/mdds/Makefile.version
@@ -0,0 +1,3 @@
+MDDS_API_VERSION=3.0
+
+
diff --git a/devel/mdds/distinfo b/devel/mdds/distinfo
index 13c5297f4c1a..970c09ab72a3 100644
--- a/devel/mdds/distinfo
+++ b/devel/mdds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755766127
-SHA256 (mdds-3.1.0.tar.bz2) = ad5475e0efa1da6648efdceb3c8b50f94ae3a91d0d70845cef93c62c5e5844c1
-SIZE (mdds-3.1.0.tar.bz2) = 659178
+TIMESTAMP = 1783938392
+SHA256 (mdds-3.2.1.tar.bz2) = 7eb71ae35bcfbea27c6f1ab094ce4fbd4093eb396d5eebe926c0d77280bc7791
+SIZE (mdds-3.2.1.tar.bz2) = 649824
diff --git a/devel/mdds/files/patch-Makefile.am b/devel/mdds/files/patch-Makefile.am
new file mode 100644
index 000000000000..b33d2ca3c198
--- /dev/null
+++ b/devel/mdds/files/patch-Makefile.am
@@ -0,0 +1,20 @@
+--- Makefile.am.orig	2026-07-13 12:45:28 UTC
++++ Makefile.am
+@@ -4,7 +4,7 @@ SUBDIRS = include example misc test tools
+ 
+ SUBDIRS = include example misc test tools
+ 
+-pkgconfdir = $(datarootdir)/pkgconfig
++pkgconfdir = @prefix@/libdata/pkgconfig
+ 
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/include \
+@@ -12,7 +12,7 @@ dist_doc_DATA = AUTHORS README.md
+ 	$(CXXFLAGS_UNITTESTS)
+ 
+ dist_doc_DATA = AUTHORS README.md
+-nodist_pkgconf_DATA = misc/mdds-@MDDS_API_VERSION@.pc
++dist_pkgconf_DATA = misc/mdds-@MDDS_API_VERSION@.pc
+ 
+ DISTCLEANFILES = \
+ 	misc/mdds-@MDDS_API_VERSION@.pc
diff --git a/devel/mdds/pkg-plist b/devel/mdds/pkg-plist
index 1c2069f05629..1987c0879cc3 100644
--- a/devel/mdds/pkg-plist
+++ b/devel/mdds/pkg-plist
@@ -1,44 +1,45 @@
 include/mdds-%%API_VERSION%%/mdds/cref_wrapper.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_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_def.inl
 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/collection.hpp
 include/mdds-%%API_VERSION%%/mdds/multi_type_vector/delayed_delete_vector.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_def.inl
 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/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_def.inl
 include/mdds-%%API_VERSION%%/mdds/rtree.hpp
 include/mdds-%%API_VERSION%%/mdds/segment_tree_def.inl
 include/mdds-%%API_VERSION%%/mdds/segment_tree.hpp
 include/mdds-%%API_VERSION%%/mdds/sorted_string_map_def.inl
 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
+include/mdds-%%API_VERSION%%/mdds/version.hpp
 libdata/pkgconfig/mdds-%%API_VERSION%%.pc