diff --git a/metadata/au.com.darkside.xdemo.yml b/metadata/au.com.darkside.xdemo.yml
index 5e62306214..220bad0f42 100644
--- a/metadata/au.com.darkside.xdemo.yml
+++ b/metadata/au.com.darkside.xdemo.yml
@@ -20,37 +20,66 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '1.27'
-    versionCode: 27
-    disable: binaries
-    commit: '1.27'
-    subdir: demo
-    gradle:
-      - yes
-
-  - versionName: '1.28'
-    versionCode: 28
-    disable: binaries
-    commit: '1.28'
-    subdir: demo
-    gradle:
-      - yes
-
-  - versionName: '1.29'
-    versionCode: 29
-    disable: binaries
-    commit: '1.29'
-    subdir: demo
-    gradle:
-      - yes
-
   - versionName: '1.31'
     versionCode: 31
-    disable: fails to build, binaries
     commit: '1.31'
+    timeout: 14400
     subdir: demo
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y qemu-user-static build-essential meson texinfo doxygen
+        libltdl-dev
     gradle:
       - yes
+    srclibs:
+      - nwrkbiz-static-build@b99172fe73ee96ee16e3040aac9ad7164d446dcc
+    prebuild:
+      - pushd $$nwrkbiz-static-build$$
+      - mv ./packages ./packages_orig
+      - mkdir -p ./packages
+      - cd ./packages
+      - ln -s ../packages_orig/GENERAL.mk
+      - ln -s ../packages_orig/000_expat
+      - ln -s ../packages_orig/000_libpthread-stubs
+      - ln -s ../packages_orig/000_xcbproto
+      - ln -s ../packages_orig/000_xorgproto
+      - ln -s ../packages_orig/000_zlib
+      - ln -s ../packages_orig/001_libjpeg
+      - ln -s ../packages_orig/001_libpng
+      - ln -s ../packages_orig/001_libXau
+      - ln -s ../packages_orig/001_libXdmcp
+      - ln -s ../packages_orig/002_freetype2
+      - ln -s ../packages_orig/002_libxcb
+      - ln -s ../packages_orig/003_xtrans
+      - ln -s ../packages_orig/004_libX11
+      - ln -s ../packages_orig/005_libXext
+      - ln -s ../packages_orig/005_libXrender
+      - ln -s ../packages_orig/006_fontconfig
+      - ln -s ../packages_orig/006_libXinerama
+      - ln -s ../packages_orig/007_libXft
+      - ln -s ../packages_orig/008_fltk
+      - sed -i -e 's/-lXft -lXinerama -lXcursor -lfontconfig -lXrender -lXext -lXfixes
+        -lharfbuzz -lfreetype -lharfbuzz //g' ./008_fltk/Makefile
+      - cd ..
+      - sed -i -e 's/-lXcursor -lXinerama -lXft  -lXrender -lXfixes -lXext //g' ./unused_packages/009_flwm/Makefile
+      - ln -s ./build_settings/linux_armhf_musl.mk
+      - ln -s ./build_settings/linux_aarch64_musl.mk
+      - sed -i -e 's/unzip -o/unzip -q -o/' compiler_packages/musl/Makefile
+      - sed -i -e 's/wget/wget -q/' compiler_packages/GENERAL.mk
+      - popd
+    scandelete:
+      - demo/src/main/jniLibs
+    build:
+      - pushd $$nwrkbiz-static-build$$
+      - make
+      - cd ./unused_packages/
+      - ln -s ../packages_orig/GENERAL.mk
+      - cd ./009_flwm/
+      - make
+      - popd
+      - cp -rf $$nwrkbiz-static-build$$/3rdParty/linux_aarch64_musl/bin/flwm ./src/main/jniLibs/arm64-v8a/libwm.so
+      - cp -rf $$nwrkbiz-static-build$$/3rdParty/linux_armhf_musl/bin/flwm ./src/main/jniLibs/armeabi-v7a/libwm.so
+    ndk: r21d
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/srclibs/nwrkbiz-static-build.yml b/srclibs/nwrkbiz-static-build.yml
new file mode 100644
index 0000000000..09149d6bac
--- /dev/null
+++ b/srclibs/nwrkbiz-static-build.yml
@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://github.com/nwrkbiz/static-build.git