diff --git a/.builds/alpine-x64.yml b/.builds/alpine-x64.yml
index ee150ad9..12aae1e6 100644
--- a/.builds/alpine-x64.yml
+++ b/.builds/alpine-x64.yml
@@ -12,6 +12,7 @@ packages:
   - wayland-protocols
   - freetype-dev
   - fontconfig-dev
+  - harfbuzz-dev
   - pixman-dev
   - libxkbcommon-dev
   - ncurses
@@ -35,12 +36,12 @@ tasks:
       ln -s ../../fcft foot/subprojects/fcft
   - debug: |
       mkdir -p bld/debug
-      meson --buildtype=debug -Dfcft:test-text-shaping=true foot bld/debug
+      meson --buildtype=debug -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/debug
       ninja -C bld/debug -k0
       meson test -C bld/debug --print-errorlogs
   - release: |
       mkdir -p bld/release
-      meson --buildtype=minsize -Dfcft:test-text-shaping=true foot bld/release
+      meson --buildtype=minsize -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/release
       ninja -C bld/release -k0
       meson test -C bld/release --print-errorlogs
   - codespell: |
diff --git a/.builds/alpine-x86.yml.disabled b/.builds/alpine-x86.yml.disabled
index fcd7dc88..1484f3e1 100644
--- a/.builds/alpine-x86.yml.disabled
+++ b/.builds/alpine-x86.yml.disabled
@@ -13,6 +13,7 @@ packages:
   - wayland-protocols
   - freetype-dev
   - fontconfig-dev
+  - harfbuzz-dev
   - pixman-dev
   - libxkbcommon-dev
   - ncurses
@@ -34,11 +35,11 @@ tasks:
       ln -s ../../fcft foot/subprojects/fcft
   - debug: |
       mkdir -p bld/debug
-      meson --buildtype=debug -Dfcft:test-text-shaping=true foot bld/debug
+      meson --buildtype=debug -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/debug
       ninja -C bld/debug -k0
       meson test -C bld/debug --print-errorlogs
   - release: |
       mkdir -p bld/release
-      meson --buildtype=minsize -Dfcft:test-text-shaping=true foot bld/release
+      meson --buildtype=minsize -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/release
       ninja -C bld/release -k0
       meson test -C bld/release --print-errorlogs
diff --git a/.builds/freebsd-x64.yml.disabled b/.builds/freebsd-x64.yml.disabled
index 7bc7dcef..8cb25940 100644
--- a/.builds/freebsd-x64.yml.disabled
+++ b/.builds/freebsd-x64.yml.disabled
@@ -8,6 +8,7 @@ packages:
   - wayland-protocols
   - freetype2
   - fontconfig
+  - harfbuzz
   - pixman
   - libxkbcommon
   - ncurses
@@ -29,11 +30,11 @@ tasks:
       ln -s ../../fcft foot/subprojects/fcft
   - debug: |
       mkdir -p bld/debug
-      meson --buildtype=debug -Dfcft:test-text-shaping=true foot bld/debug
+      meson --buildtype=debug -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/debug
       ninja -C bld/debug -k0
       meson test -C bld/debug --print-errorlogs
   - release: |
       mkdir -p bld/release
-      meson --buildtype=minsize -Dfcft:test-text-shaping=true foot bld/release
+      meson --buildtype=minsize -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/release
       ninja -C bld/release -k0
       meson test -C bld/release --print-errorlogs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f23b2017..5200fc42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ before_script:
   - echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
   - apk update
   - apk add musl-dev linux-headers meson ninja gcc scdoc ncurses
-  - apk add libxkbcommon-dev pixman-dev freetype-dev fontconfig-dev
+  - apk add libxkbcommon-dev pixman-dev freetype-dev fontconfig-dev harfbuzz-dev
   - apk add wayland-dev wayland-protocols
   - apk add git
   - mkdir -p subprojects && cd subprojects
@@ -22,7 +22,7 @@ debug-x64:
   script:
     - mkdir -p bld/debug
     - cd bld/debug
-    - meson --buildtype=debug -Dfcft:test-text-shaping=true ../../
+    - meson --buildtype=debug -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../../
     - ninja -v -k0
     - ninja -v test
 
@@ -32,7 +32,7 @@ release-x64:
   script:
     - mkdir -p bld/release
     - cd bld/release
-    - meson --buildtype=release -Dfcft:test-text-shaping=true ../../
+    - meson --buildtype=release -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true ../../
     - ninja -v -k0
     - ninja -v test
 
@@ -42,7 +42,7 @@ debug-x86:
   script:
     - mkdir -p bld/debug
     - cd bld/debug
-    - meson --buildtype=debug -Dfcft:test-text-shaping=true ../../
+    - meson --buildtype=debug -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true ../../
     - ninja -v -k0
     - ninja -v test
 
@@ -52,7 +52,7 @@ release-x86:
   script:
     - mkdir -p bld/release
     - cd bld/release
-    - meson --buildtype=release -Dfcft:test-text-shaping=true ../../
+    - meson --buildtype=release -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true ../../
     - ninja -v -k0
     - ninja -v test