diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 97f8eb779d..e3d5727cc0 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -74,15 +74,31 @@ requires {
 	lib:libicuuc
 	lib:libncurses >= 6.0
 #ifdef HAIKU_REGULAR_BUILD
+#ifdef HAIKU_BUILD_FEATURE_X86_EXPAT_ENABLED
 	lib:libexpat
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GUTENPRINT_ENABLED
 	lib:libgutenprint
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_LIBICNS_ENABLED
 	lib:libicns
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_JASPER_ENABLED
 	lib:libjasper
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_JPEG_ENABLED
 	lib:libjpeg
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_LIBPNG_ENABLED
 	lib:libpng >= 16.0
+#endif
 	lib:libqrencode
+#ifdef HAIKU_BUILD_FEATURE_X86_TIFF_ENABLED
 	lib:libtiff >= 5.2
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_LIBWEBP_ENABLED
 	lib:libwebp
+#endif
 #endif
 	lib:libsolv
 	lib:libsolvext
diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
index eae0aea1a2..8115ac4b47 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -74,15 +74,31 @@ requires {
 	lib:libicuuc
 	lib:libncurses >= 6.0
 #ifdef HAIKU_REGULAR_BUILD
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_EXPAT_ENABLED
 	lib:libexpat
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_GUTENPRINT_ENABLED
 	lib:libgutenprint
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBICNS_ENABLED
 	lib:libicns
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_JASPER_ENABLED
 	lib:libjasper
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_JPEG_ENABLED
 	lib:libjpeg
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBPNG_ENABLED
 	lib:libpng >= 16.0
+#endif
 	lib:libqrencode
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED
 	lib:libtiff >= 5.2
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBWEBP_ENABLED
 	lib:libwebp
+#endif
 #endif
 	lib:libsolv
 	lib:libsolvext