diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe
index 410ecbbc4..d3df26e96 100644
--- a/media-libs/openjpeg/openjpeg-1.5.0.recipe
+++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe
@@ -54,17 +54,14 @@ REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libz$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
-	"
-# haiku_x86 doesn't claim to provide lib:libtiff_x86 on gcc2 builds
-if [ "$targetArchitecture" != x86_gcc2 ];then
-	REQUIRES="$REQUIRES lib:libtiff$secondaryArchSuffix"
-fi
+	lib:libtiff$secondaryArchSuffix
+"
 
 BUILD_REQUIRES="
-	devel:libz
-	devel:libpng
-	"
-#needs devel:libtiff too but that isn't provided by anything
+	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+"
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.0.recipe
index f3533da71..e1f5a3259 100644
--- a/media-libs/openjpeg/openjpeg-2.1.0.recipe
+++ b/media-libs/openjpeg/openjpeg-2.1.0.recipe
@@ -42,15 +42,13 @@ REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libz$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
-	"
-# haiku_x86 doesn't claim to provide lib:libtiff_x86 on gcc2 builds
-if [ "$targetArchitecture" != x86_gcc2 ];then
-	REQUIRES="$REQUIRES lib:libtiff$secondaryArchSuffix"
-fi
+	lib:libtiff$secondaryArchSuffix
+"
 
 BUILD_REQUIRES="
-	devel:libz
-	devel:libpng
+	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
 	"
 #needs devel:libtiff too but that isn't provided by anything