diff --git a/pmb/parse/arch.py b/pmb/parse/arch.py
index 8564923c..42d4f292 100644
--- a/pmb/parse/arch.py
+++ b/pmb/parse/arch.py
@@ -92,8 +92,13 @@ def alpine_to_hostspec(arch):
     """
     mapping = {
         "aarch64": "aarch64-alpine-linux-musl",
-        "armhf": "armv6-alpine-linux-muslgnueabihf",
+        "armel": "armv5-alpine-linux-musleabi",
+        "armhf": "armv6-alpine-linux-musleabihf",
         "armv7": "armv7-alpine-linux-musleabihf",
+        "mips": "mips-alpine-linux-musl",
+        "mips64": "mips64-alpine-linux-musl",
+        "mipsel": "mipsel-alpine-linux-musl",
+        "mips64el": "mips64el-alpine-linux-musl",
         "ppc": "powerpc-alpine-linux-musl",
         "ppc64": "powerpc64-alpine-linux-musl",
         "ppc64le": "powerpc64le-alpine-linux-musl",
diff --git a/test/test_build_package.py b/test/test_build_package.py
index dd69f09e..5a228d1c 100644
--- a/test/test_build_package.py
+++ b/test/test_build_package.py
@@ -272,8 +272,8 @@ def test_run_abuild(args, monkeypatch):
     # cross=native
     env = {"CARCH": "armhf",
            "SUDO_APK": "abuild-apk --no-progress",
-           "CROSS_COMPILE": "armv6-alpine-linux-muslgnueabihf-",
-           "CC": "armv6-alpine-linux-muslgnueabihf-gcc"}
+           "CROSS_COMPILE": "armv6-alpine-linux-musleabihf-",
+           "CC": "armv6-alpine-linux-musleabihf-gcc"}
     cmd = ["abuild", "-D", "postmarketOS", "-d"]
     assert func(args, apkbuild, "armhf", cross="native") == (output, cmd, env)