diff --git a/src/data/package_infos/generic/haiku_cross_devel b/src/data/package_infos/generic/haiku_cross_devel
index 4ee25448a3..d91b0b385f 100644
--- a/src/data/package_infos/generic/haiku_cross_devel
+++ b/src/data/package_infos/generic/haiku_cross_devel
@@ -1,22 +1,21 @@
+#define DO_CONCAT(a, b) a ## b
+#define CONCAT(a, b) DO_CONCAT(a, b)
+
 name			haiku_cross_devel
 version			R1~alpha4_pm-1
-architecture	HAIKU_PACKAGING_ARCH
+architecture	any
 summary			"The Haiku base system files for cross development"
 
-description		"The package contains all files associated with the base system
-needed for cross development, like static libraries, glue code, library symlinks,
-header files, etc."
+description		"The package contains all files associated with the base \
+system needed for cross development, like static libraries, glue code, \
+library symlinks, header files, etc."
 
 packager		"The Haiku build system"
 vendor			"Haiku Project"
 
-copyrights		"2001-2011 Haiku, Inc. et al"
+copyrights		"2001-2013 Haiku, Inc. et al"
 licenses		"MIT"
 
 provides {
-	haiku_cross_devel = R1~alpha4_pm-1
-}
-
-requires {
-	haiku == R1~alpha4_pm-1
+	CONCAT(haiku_cross_devel_, HAIKU_PACKAGING_ARCH) = R1~alpha4_pm-1
 }
diff --git a/src/data/package_infos/generic/haiku_cross_devel_wrapper b/src/data/package_infos/generic/haiku_cross_devel_wrapper
index 983dacca35..e3fbc826b7 100644
--- a/src/data/package_infos/generic/haiku_cross_devel_wrapper
+++ b/src/data/package_infos/generic/haiku_cross_devel_wrapper
@@ -1,10 +1,13 @@
+#define DO_CONCAT(a, b) a ## b
+#define CONCAT(a, b) DO_CONCAT(a, b)
+
 name			haiku_cross_devel_wrapper
 version			R1~alpha4_pm-1
-architecture	HAIKU_PACKAGING_ARCH
+architecture	any
 summary			"Contains a package with system files for cross development"
 
-description		"This package provides a package that contains all files 
-associated with the base system needed for cross development, like static 
+description		"This package provides a package that contains all files \
+associated with the base system needed for cross development, like static \
 libraries, glue code, library symlinks, header files, etc."
 
 packager		"The Haiku build system"
@@ -14,9 +17,5 @@ copyrights		"2001-2013 Haiku, Inc. et al"
 licenses		"MIT"
 
 provides {
-	haiku_cross_devel_wrapper = R1~alpha4_pm-1
-}
-
-requires {
-	haiku == R1~alpha4_pm-1
+	CONCAT(haiku_cross_devel_wrapper_, HAIKU_PACKAGING_ARCH) = R1~alpha4_pm-1
 }