diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c52d40c42c30b0387e78fad20339c24db08a7c9..e3a1a98b4fe1e2df0d4e6e6388f08b8386fb7853 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,6 +46,34 @@ build:ubuntu:
     - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
     - cmake --build build
 
+# Based on Bruce Cowan's wordsearch package:
+flatpak:
+  image: alpine:latest
+  stage: deploy
+  only:
+    - develop
+  variables:
+    MANIFEST_PATH: "build-aux/com.fossgalaxy.fggl.demo.yml"
+    RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
+    FLATPAK_MODULE: "fggl"
+    BUNDLE: "fggl-demo.flatpak"
+    APP_ID: "com.fossgalaxy.fggl.demo"
+  script:
+    - apk update && apk add flatpak-builder
+    - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    - flatpak install -y flathub org.freedesktop.Platform 21.08
+    - flatpak install -y flathub org.freedesktop.Sdk 21.08
+    - flatpak-builder ${MANIFEST_PATH}
+    - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID}
+  artifacts:
+    paths:
+      - ${BUNDLE}
+      - _build/meson-logs/meson-log.txt
+  cache:
+    paths:
+      - .flatpak-builder/cache
+      - .flatpak-builder/downloads
+
 # Deploy doxygen pages
 pages:
   extends: .f34-ogl