diff --git a/dev-cpp/tbb/tbb-2022.3.0.recipe b/dev-cpp/tbb/tbb-2022.3.0.recipe
index 391cf997c..63068a2d4 100644
--- a/dev-cpp/tbb/tbb-2022.3.0.recipe
+++ b/dev-cpp/tbb/tbb-2022.3.0.recipe
@@ -12,8 +12,8 @@ CHECKSUM_SHA256="01598a46c1162c27253a0de0236f520fd8ee8166e9ebb84a4243574f88e6e50
 SOURCE_DIR="oneTBB-$portVersion"
 PATCHES="tbb-$portVersion.patchset"
 
-ARCHITECTURES="?all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 libtbbVersion="12.17"
 libtbbVersionCompat="$libtbbVersion compat >= ${libtbbVersion%%.*}"
diff --git a/dev-cpp/tbb/tbb-2018.5.recipe b/dev-cpp/tbb/tbb2018.5-2018.5.recipe
similarity index 82%
rename from dev-cpp/tbb/tbb-2018.5.recipe
rename to dev-cpp/tbb/tbb2018.5-2018.5.recipe
index 9fe361977..e8b167c9c 100644
--- a/dev-cpp/tbb/tbb-2018.5.recipe
+++ b/dev-cpp/tbb/tbb2018.5-2018.5.recipe
@@ -8,15 +8,15 @@ COPYRIGHT="2005-2018 Intel Corporation"
 LICENSE="Apache v2"
 REVISION="3"
 SOURCE_URI="https://github.com/01org/tbb/archive/${portVersion/./_U}.tar.gz"
-CHECKSUM_SHA256="c4c2896af527392496c5e01ef8579058a71b6eebbd695924cd138841c13f07be"
-SOURCE_DIR="tbb-${portVersion/./_U}"
+CHECKSUM_SHA256="b8dbab5aea2b70cf07844f86fa413e549e099aa3205b6a04059ca92ead93a372"
+SOURCE_DIR="oneTBB-${portVersion/./_U}"
 PATCHES="tbb-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	tbb$secondaryArchSuffix = $portVersion
+	tbb2018.5$secondaryArchSuffix = $portVersion
 	lib:libtbb$secondaryArchSuffix = $portVersion
 	lib:libtbbmalloc$secondaryArchSuffix = $portVersion
 	lib:libtbbmalloc_proxy$secondaryArchSuffix = $portVersion
@@ -24,15 +24,18 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+CONFLICTS="
+	tbb$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	tbb${secondaryArchSuffix}_devel = $portVersion
+	tbb2018.5${secondaryArchSuffix}_devel = $portVersion
 	devel:libtbb$secondaryArchSuffix = $portVersion
 	devel:libtbbmalloc$secondaryArchSuffix = $portVersion
 	devel:libtbbmalloc_proxy$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
-	tbb$secondaryArchSuffix == $portVersion base
+	tbb2018.5$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -46,13 +49,14 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-defineDebugInfoPackage tbb$secondaryArchSuffix \
+defineDebugInfoPackage tbb2018.5$secondaryArchSuffix \
 	$libDir/libtbb.so.2 \
 	$libDir/libtbbmalloc.so.2 \
 	$libDir/libtbbmalloc_proxy.so.2
 
 BUILD()
 {
+	export CXXFLAGS="-Wno-changes-meaning"
 	make $jobArgs
 }