diff --git a/dev-util/mdds/mdds2.1-2.1.1.recipe b/dev-util/mdds/mdds2.1-2.1.1.recipe
index 224ab1758..5a1a5e72e 100644
--- a/dev-util/mdds/mdds2.1-2.1.1.recipe
+++ b/dev-util/mdds/mdds2.1-2.1.1.recipe
@@ -2,41 +2,41 @@ SUMMARY="Multi-Dimensional Data Structure"
 DESCRIPTION="mdds is a collection of multi-dimensional data structure \
 and indexing algorithms."
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-COPYRIGHT="2010-2021 Kohei Yoshida et al."
+COPYRIGHT="2010-2015 Kohei Yoshida et al."
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://kohei.us/files/mdds/src/mdds-$portVersion.tar.bz2"
 CHECKSUM_SHA256="8a3767f0a60c53261b5ebbaa717381446813aef8cf28fe9d0ea1371123bbe3f1"
 SOURCE_DIR="mdds-$portVersion"
 
-ARCHITECTURES="any"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	mdds2.1 = $portVersion compat >= 2.1
-	devel:mdds = $portVersion compat >= 2.1
+	mdds2.1$secondaryArchSuffix = $portVersion compat >= 2.1
+	devel:mdds$secondaryArchSuffix = $portVersion compat >= 2.1
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:autoreconf
-	cmd:g++
-	cmd:ld
+	cmd:g++$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
 
-PATCH()
-{
-	sed -e '/AX_CXX_COMPILE_STDCXX_17/ s/^#*/#/' -i configure.ac
-}
+TEST_REQUIRES="
+	devel:libboost_system$secondaryArchSuffix >= 1.83.0
+	"
 
 BUILD()
 {