diff --git a/aports/cross/binutils-aarch64/APKBUILD b/aports/cross/binutils-aarch64/APKBUILD
index ce067c4b..986cdbf4 100644
--- a/aports/cross/binutils-aarch64/APKBUILD
+++ b/aports/cross/binutils-aarch64/APKBUILD
@@ -12,7 +12,7 @@ depends=""
 makedepends_build=""
 makedepends_host=""
 makedepends="gettext libtool autoconf automake bison"
-arch="armhf x86_64"
+arch="armhf x86_64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages=""
 source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
diff --git a/aports/cross/binutils-armhf/APKBUILD b/aports/cross/binutils-armhf/APKBUILD
index 7c70cf89..92839d1d 100644
--- a/aports/cross/binutils-armhf/APKBUILD
+++ b/aports/cross/binutils-armhf/APKBUILD
@@ -12,7 +12,7 @@ depends=""
 makedepends_build=""
 makedepends_host=""
 makedepends="gettext libtool autoconf automake bison"
-arch="aarch64 x86_64"
+arch="aarch64 x86_64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages=""
 source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
diff --git a/aports/cross/binutils-x86_64/APKBUILD b/aports/cross/binutils-x86_64/APKBUILD
index 5bdbd76e..258c968a 100644
--- a/aports/cross/binutils-x86_64/APKBUILD
+++ b/aports/cross/binutils-x86_64/APKBUILD
@@ -12,7 +12,7 @@ depends=""
 makedepends_build=""
 makedepends_host=""
 makedepends="gettext libtool autoconf automake bison"
-arch="armhf aarch64"
+arch="armhf aarch64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages=""
 source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
diff --git a/aports/cross/gcc-aarch64/APKBUILD b/aports/cross/gcc-aarch64/APKBUILD
index 1113d499..49efcf72 100644
--- a/aports/cross/gcc-aarch64/APKBUILD
+++ b/aports/cross/gcc-aarch64/APKBUILD
@@ -57,7 +57,7 @@ pkgname="gcc-aarch64"
 pkgrel=6
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="http://gcc.gnu.org"
-arch="armhf x86_64"
+arch="armhf x86_64 x86"
 license="GPL LGPL"
 _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-aarch64"
diff --git a/aports/cross/gcc-armhf/APKBUILD b/aports/cross/gcc-armhf/APKBUILD
index 0f666d6c..58f2a929 100644
--- a/aports/cross/gcc-armhf/APKBUILD
+++ b/aports/cross/gcc-armhf/APKBUILD
@@ -57,7 +57,7 @@ pkgname="gcc-armhf"
 pkgrel=6
 pkgdesc="Stage2 cross-compiler for armhf"
 url="http://gcc.gnu.org"
-arch="aarch64 x86_64"
+arch="aarch64 x86_64 x86"
 license="GPL LGPL"
 _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-armhf"
diff --git a/aports/cross/gcc-x86_64/APKBUILD b/aports/cross/gcc-x86_64/APKBUILD
index 5517af23..9a90c2ab 100644
--- a/aports/cross/gcc-x86_64/APKBUILD
+++ b/aports/cross/gcc-x86_64/APKBUILD
@@ -57,7 +57,7 @@ pkgname="gcc-x86_64"
 pkgrel=6
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="http://gcc.gnu.org"
-arch="armhf aarch64"
+arch="armhf aarch64 x86"
 license="GPL LGPL"
 _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-x86_64"
diff --git a/aports/cross/musl-aarch64/APKBUILD b/aports/cross/musl-aarch64/APKBUILD
index d10727bf..e2ce84a9 100644
--- a/aports/cross/musl-aarch64/APKBUILD
+++ b/aports/cross/musl-aarch64/APKBUILD
@@ -4,7 +4,7 @@
 pkgname="musl-aarch64"
 pkgver="1.1.18"
 pkgrel=5
-arch="armhf x86_64"
+arch="armhf x86_64 x86"
 subpackages="musl-dev-aarch64:package_dev"
 
 _arch="aarch64"
diff --git a/aports/cross/musl-armhf/APKBUILD b/aports/cross/musl-armhf/APKBUILD
index 738a859e..95601847 100644
--- a/aports/cross/musl-armhf/APKBUILD
+++ b/aports/cross/musl-armhf/APKBUILD
@@ -4,7 +4,7 @@
 pkgname="musl-armhf"
 pkgver="1.1.18"
 pkgrel=5
-arch="aarch64 x86_64"
+arch="aarch64 x86_64 x86"
 subpackages="musl-dev-armhf:package_dev"
 
 _arch="armhf"
diff --git a/aports/cross/musl-x86_64/APKBUILD b/aports/cross/musl-x86_64/APKBUILD
index aa237eec..ee24f2e2 100644
--- a/aports/cross/musl-x86_64/APKBUILD
+++ b/aports/cross/musl-x86_64/APKBUILD
@@ -4,7 +4,7 @@
 pkgname="musl-x86_64"
 pkgver="1.1.18"
 pkgrel=5
-arch="armhf aarch64"
+arch="armhf aarch64 x86"
 subpackages="musl-dev-x86_64:package_dev"
 
 _arch="x86_64"
diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index 326f8bd4..c55b2ed9 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -144,14 +144,11 @@ apkindex_retention_time = 4
 #
 # BUILD
 #
-
-# Officially supported target architectures for postmarketOS. Only
-# specify architectures supported by Alpine here. When creating a noarch
-# package, symlinks for all architectures get created - so only specify
-# architectures, where we really have device-* packages for.
-# For cross-compiling we need the "musl-$ARCH", "binutils-$ARCH" and
-# "gcc-$ARCH" packages of each target architecture.
-build_device_architectures = ["armhf", "aarch64", "x86_64"]
+# Officially supported host/target architectures for postmarketOS. Only
+# specify architectures supported by Alpine here. Fro cross-compiling,
+# we need to generate the "musl-$ARCH", "binutils-$ARCH" and "gcc-$ARCH"
+# packages (use "pmbootstrap aportgen musl-armhf" etc.).
+build_device_architectures = ["armhf", "aarch64", "x86_64", "x86"]
 
 # Packages, that will be installed in a chroot before it builds packages
 # for the first time