diff --git a/dev-libs/ixion/ixion-0.17.0.recipe b/dev-libs/ixion/ixion-0.17.0.recipe
index a0e47abd2..80d9cf320 100644
--- a/dev-libs/ixion/ixion-0.17.0.recipe
+++ b/dev-libs/ixion/ixion-0.17.0.recipe
@@ -10,7 +10,7 @@ and a partial calculation of only the affected cells need to be calculated."
 HOMEPAGE="https://gitlab.com/ixion/ixion"
 COPYRIGHT="Kohei Yoshida et al."
 LICENSE="MPL v2.0"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://gitlab.com/ixion/ixion/-/archive/$portVersion/ixion-$portVersion.tar.bz2"
 CHECKSUM_SHA256="63f3942defc684be82046b9d7454602dadafced9be7b3b60e9e8a5fa63ee91a8"
 SOURCE_DIR="ixion-$portVersion"
@@ -24,9 +24,6 @@ soVersion="${portVersion%.*}"
 
 PROVIDES="
 	ixion$secondaryArchSuffix = $portVersion
-	cmd:ixion_formula_tokenizer$secondaryArchSuffix = $portVersion
-	cmd:ixion_parser$secondaryArchSuffix = $portVersion
-	cmd:ixion_sorter$secondaryArchSuffix = $portVersion
 	lib:libixion_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 REQUIRES="
@@ -45,6 +42,17 @@ REQUIRES_devel="
 	ixion$secondaryArchSuffix == $portVersion base
 	"
 
+PROVIDES_tools="
+	ixion${secondaryArchSuffix}_tools = $portVersion
+	cmd:ixion_formula_tokenizer$secondaryArchSuffix = $portVersion
+	cmd:ixion_parser$secondaryArchSuffix = $portVersion
+	cmd:ixion_sorter$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_tools="
+	$REQUIRES
+	ixion$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion
@@ -66,9 +74,9 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage ixion$secondaryArchSuffix \
-	"$binDir"/ixion-formula-tokenizer \
-	"$binDir"/ixion-parser \
-	"$binDir"/ixion-sorter \
+	"$(getPackagePrefix tools)"/bin/ixion-formula-tokenizer \
+	"$(getPackagePrefix tools)"/bin/ixion-parser \
+	"$(getPackagePrefix tools)"/bin/ixion-sorter \
 	"$libDir"/libixion-$soVersion.so.0.0.0
 
 PATCH()
@@ -97,6 +105,9 @@ INSTALL()
 
 	packageEntries devel \
 		"$developDir"
+
+	packageEntries tools \
+		"$binDir"
 }
 
 TEST()
diff --git a/dev-libs/ixion/ixion0.18-0.18.1.recipe b/dev-libs/ixion/ixion0.18-0.18.1.recipe
new file mode 100644
index 000000000..cd30956cd
--- /dev/null
+++ b/dev-libs/ixion/ixion0.18-0.18.1.recipe
@@ -0,0 +1,120 @@
+SUMMARY="A general purpose formula parser and interpreter"
+DESCRIPTION="Ixion is a general purpose formula parser & interpreter that can \
+calculate multiple named targets, or \"cells\".
+The cells can be referenced from each other, and the library takes care \
+of resolving their dependencies automatically upon calculation. The caller \
+can run the calculation routine either in a single-threaded mode, or \
+a multi-threaded mode. The library also supports re-calculations where the \
+contents of one or more cells have been modified since the last calculation, \
+and a partial calculation of only the affected cells need to be calculated."
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+COPYRIGHT="Kohei Yoshida et al."
+LICENSE="MPL v2.0"
+REVISION="1"
+SOURCE_URI="https://gitlab.com/ixion/ixion/-/archive/$portVersion/ixion-$portVersion.tar.bz2"
+CHECKSUM_SHA256="c2975b0aa9f6e1a76c690928cdaa6f48d414cf6f8cca83c9e8c713dec4da18f0"
+SOURCE_DIR="ixion-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+boostMinimumVersion=1.83.0
+
+soVersion="${portVersion%.*}"
+
+PROVIDES="
+	ixion0.18$secondaryArchSuffix = $portVersion
+	lib:libixion_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libboost_filesystem$secondaryArchSuffix
+	lib:libboost_program_options$secondaryArchSuffix
+	lib:libboost_system$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	ixion0.18${secondaryArchSuffix}_devel = $portVersion
+	devel:libixion_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	ixion0.18$secondaryArchSuffix == $portVersion base
+	"
+
+PROVIDES_tools="
+	ixion0.18${secondaryArchSuffix}_tools = $portVersion
+	cmd:ixion_formula_tokenizer$secondaryArchSuffix = $portVersion
+	cmd:ixion_parser$secondaryArchSuffix = $portVersion
+	cmd:ixion_sorter$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_tools="
+	$REQUIRES
+	ixion0.18$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_tools="
+	ixion${secondaryArchSuffix}_tools
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion
+	devel:libboost_program_options$secondaryArchSuffix >= $boostMinimumVersion
+	devel:libboost_system$secondaryArchSuffix >= $boostMinimumVersion
+	devel:libz$secondaryArchSuffix
+	devel:libspdlog$secondaryArchSuffix
+	devel:mdds$secondaryArchSuffix >= 2.1
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage ixion0.18$secondaryArchSuffix \
+	"$(getPackagePrefix tools)"/bin/ixion-formula-tokenizer \
+	"$(getPackagePrefix tools)"/bin/ixion-parser \
+	"$(getPackagePrefix tools)"/bin/ixion-sorter \
+	"$libDir"/libixion-$soVersion.so.0.0.0
+
+PATCH()
+{
+	sed -i 's/-ldl//g' configure.ac
+	sed -i 's/-pthread//g' configure.ac
+	sed -i 's#$with_boost/include#$with_boost/headers#g' m4/boost.m4
+}
+
+BUILD()
+{
+	autoreconf -fi
+	BOOST_ROOT="$portPackageLinksDir"/devel~libboost_program_options/develop
+	runConfigure ./configure --enable-python=no
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm -f "$libDir"/libixion-$soVersion.la
+
+	prepareInstalledDevelLib libixion-$soVersion
+	fixPkgconfig
+
+	packageEntries devel \
+		"$developDir"
+
+	packageEntries tools \
+		"$binDir"
+}
+
+TEST()
+{
+	LIBRARY_PATH="$sourceDir/src/libixion/.libs${LIBRARY_PATH:+:$LIBRARY_PATH}" \
+	make check
+}