@@ -12,7 +12,8 @@ jobs:
       matrix:
         buildplat:
           - { runs_on: ubuntu-20.04, sys: manylinux, arch: x86_64, benv: "" }
-          - { runs_on: macos-12,     sys: macosx,    arch: x86_64, benv: "12.0" }
+          - { runs_on: ubuntu-20.04, sys: musllinux, arch: x86_64, benv: "" }
+          - { runs_on: ubuntu-20.04, sys: musllinux, arch: aarch64, benv: "" }
           - { runs_on: macos-14,     sys: macosx,    arch: arm64,  benv: "14.0" }
         python:
           - { cp: "cp38",   rel: "3.8" }
@@ -33,8 +34,8 @@ jobs:
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel
 
-      - name: Build wheels (Linux)
-        if: ${{ runner.os != 'macOS' }}
+      - name: Build wheels (Linux glibc)
+        if: ${{ matrix.buildplat.sys == 'manylinux' }}
         run: python -m cibuildwheel --output-dir wheelhouse
         env:
            CIBW_BUILD: ${{ matrix.python.cp }}-${{ matrix.buildplat.sys }}*
@@ -50,11 +51,25 @@ jobs:
                 rsync -av --ignore-existing /usr/share/aclocal/*.m4 /usr/local/share/aclocal/
               fi &&
               ./build-deps.sh
-           CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64
+           CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
+           CIBW_SKIP: "*-win* *-manylinux_i686 pp*"
+
+      - name: Build wheels (Linux musl)
+        if: ${{ matrix.buildplat.sys == 'musllinux' }}
+        run: python -m cibuildwheel --output-dir wheelhouse
+        env:
+           CIBW_BUILD: ${{ matrix.python.cp }}-${{ matrix.buildplat.sys }}*
+           CIBW_ARCHS_LINUX: "x86_64 aarch64"
+           CIBW_BEFORE_ALL_LINUX: >
+              apk add build-base git autoconf-archive autoconf automake libtool bzip2-dev icu-dev libxml2-dev libexttextcat-dev libtool rsync &&
+              mkdir -p /usr/local/share/aclocal/ && rsync -av --ignore-existing /usr/share/aclocal/*.m4 /usr/local/share/aclocal/ &&
+              ./build-deps.sh
+           CIBW_MUSLLINUX_X86_64_IMAGE: quay.io/pypa/musllinux_1_1_x86_64
+           CIBW_MUSLLINUX_AARCH64_IMAGE: quay.io/pypa/musllinux_1_1_aarch64
            CIBW_SKIP: "*-win* *-manylinux_i686 pp*"
 
       - name: Build wheels (macOS)
-        if: ${{ runner.os == 'macOS' && runner.python != '3.8' }}
+        if: ${{ runner.os == 'macOS' && matrix.python.cp != 'cp38' }}
         run: python -m cibuildwheel --output-dir wheelhouse
         env:
            CIBW_BUILD: ${{ matrix.python.cp }}-${{ matrix.buildplat.sys }}*
@@ -65,7 +80,7 @@ jobs:
               brew install frog
 
       - uses: actions/upload-artifact@v4
-        if: ${{ ! (runner.os == 'macOS' && runner.python == '3.8') }}
+        if: ${{ ! (runner.os == 'macOS' && matrix.python.cp == '3.8') }}
         with:
           name: ${{matrix.python.cp}}-${{matrix.buildplat.sys}}-${{matrix.buildplat.arch}}
           path: ./wheelhouse/*.whl
@@ -7,6 +7,8 @@
 set -e
 
 . /etc/os-release
+echo "OS: $ID">&2
+echo "VERSION: $VERSION_ID">&2
 
 get_latest_version() {
     #Finds the latest git tag or falls back to returning the git default branch (usually master or main)
@@ -27,24 +29,27 @@ if [ "$ID" = "almalinux" ] || [ "$ID" = "centos" ] || [ "$ID" = "rhel" ]; then
         #needed for manylinux_2_28 container which ships custom autoconf, possibly others too?
         export ACLOCAL_PATH=/usr/share/aclocal
     fi
-    if [ "$VERSION_ID" = "7" ]; then
-        yum install -y libexttextcat-devel
-        if [ -d /opt/rh/devtoolset-10/root/usr/lib ]; then
-            #we are running in the manylinux2014 image
-            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/opt/rh/devtoolset-10/root/usr/lib
-            #libxml2 is out of date, compile and install a new one
-            yum install -y xz
-            wget https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.14.tar.xz
-            unxz libxml2-2.9.14.tar.xz
-            tar -xf libxml2-2.9.14.tar
-            cd libxml2-2.9.14 && ./configure --prefix=$PREFIX --without-python && make && make install
-            cd ..
-        fi
-    elif [ "$VERSION_ID" = "8" ]; then
-        #they forgot to package libexttextcat-devel? grab one manually:
-        wget https://github.com/proycon/LaMachine/raw/master/deps/centos8/libexttextcat-devel-3.4.5-2.el8.x86_64.rpm
-        yum install -y libexttextcat-devel-3.4.5-2.el8.x86_64.rpm
-    fi
+    case $VERSION_ID in
+        7*)
+            yum install -y libexttextcat-devel
+            if [ -d /opt/rh/devtoolset-10/root/usr/lib ]; then
+                #we are running in the manylinux2014 image
+                export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/opt/rh/devtoolset-10/root/usr/lib
+                #libxml2 is out of date, compile and install a new one
+                yum install -y xz
+                wget https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.14.tar.xz
+                unxz libxml2-2.9.14.tar.xz
+                tar -xf libxml2-2.9.14.tar
+                cd libxml2-2.9.14 && ./configure --prefix=$PREFIX --without-python && make && make install
+                cd ..
+            fi
+            ;;
+        8*)
+            #they forgot to package libexttextcat-devel? grab one manually:
+            wget https://github.com/proycon/LaMachine/raw/master/deps/centos8/libexttextcat-devel-3.4.5-2.el8.x86_64.rpm
+            yum install -y libexttextcat-devel-3.4.5-2.el8.x86_64.rpm
+            ;;
+    esac
 fi
 
 PWD="$(pwd)"
@@ -77,5 +82,4 @@ for PACKAGE in LanguageMachines/ticcutils LanguageMachines/libfolia LanguageMach
 done
 cd $PWD
 [ -n "$BUILDDIR" ] && rm -Rf "$BUILDDIR"
-
 echo "Dependencies installed" >&2
@@ -66,7 +66,7 @@
 
 setup(
     name = 'python-frog',
-    version = '0.6.10', #also ensure UCTODATAVERSION and FROGDATAVERSION are good in frog_wrapper.pyx
+    version = '0.6.11', #also ensure UCTODATAVERSION and FROGDATAVERSION are good in frog_wrapper.pyx
     author = "Maarten van Gompel",
     author_email = "proycon@anaproy.nl",
     description = ("Python binding to Frog, an NLP suite for Dutch doing part-of-speech tagging, lemmatisation, morphological analysis, named-entity recognition, shallow parsing, and dependency parsing."),