diff --git a/0ad-data/acquire b/0ad-data/acquire
index 78e6278d9..4f74a5223 100644
--- a/0ad-data/acquire
+++ b/0ad-data/acquire
@@ -1,4 +1,4 @@
 #!/usr/bin/env dl
 
-0ad-${UB_VERSION/~/-}-unix-data.tar.xz .
+0ad-${UB_VERSION/~/-}-unix-data.tar.xz 0ad-${UB_VERSION/~/-}/binaries/data :/usr/share/0ad/data
       http://releases.wildfiregames.com/
diff --git a/0ad-data/install b/0ad-data/install
deleted file mode 100644
index 147112cd6..000000000
--- a/0ad-data/install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -eux
-
-install -d $UB_INSTALLDIR/usr/share/0ad/data
-cd binaries
-cp -a data $UB_INSTALLDIR/usr/share/0ad/
diff --git a/0ad-data/version b/0ad-data/version
index e04f8ade2..aebe4d5a7 100644
--- a/0ad-data/version
+++ b/0ad-data/version
@@ -1 +1 @@
-0.0.24~alpha
+0.0.23~alpha
diff --git a/0ad/acquire b/0ad/acquire
index 9d29ade26..528cc4648 100644
--- a/0ad/acquire
+++ b/0ad/acquire
@@ -1,4 +1,4 @@
 #!/usr/bin/env dl
 
-0ad-${UB_VERSION/~/-}-unix-build.tar.gz .
+0ad-${UB_VERSION/~/-}-unix-build.tar.gz 0ad-${UB_VERSION/~/-}/
       http://releases.wildfiregames.com/
diff --git a/0ad/build-depends b/0ad/build-depends
index 241e779fc..c83b44291 100644
--- a/0ad/build-depends
+++ b/0ad/build-depends
@@ -1,20 +1,26 @@
+binutils-dev
 boost-dev
 curl-dev
 enet-dev
-fmt-dev
+gamin-dev
 gloox-dev
 glu-dev
 icu-dev
+js24-dev
+libjpeg-turbo-dev
+libogg-dev
 libpng-dev
+libsm-dev
 libsodium-dev
+libtiff-dev
 libvorbis-dev
-libx11-dev
+libxcursor-dev
 libxml2-dev
-llvm
 miniupnpc-dev
+nspr-dev
 openal-dev
-python3-dev
-rust
+openexr-dev
+python2-dev
 sdl2-dev
 wxwidgets-dev
-zlib-dev
+zip
diff --git a/0ad/compile b/0ad/compile
index adf1945a7..5858781aa 100644
--- a/0ad/compile
+++ b/0ad/compile
@@ -4,19 +4,15 @@ export CTARGET="x86_64-linux-gnu"
 export CHOST="x86_64-linux-gnu"
 export CBUILD="x86_64-linux-gnu"
 
-sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh
-
-export CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1 -Wno-deprecated-copy '
-export CXXFLAGS+=' -Wno-class-memaccess -Wno-unused-but-set-variable -DBOOST_BIND_GLOBAL_PLACEHOLDERS '
-
-export SDL2_CONFIG="pkg-config sdl2"
 cd build/workspaces
+export CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+export SDL2_CONFIG="pkg-config sdl2"
+export PYTHON=python2
 ./update-workspaces.sh \
 	--bindir=/usr/bin \
     --libdir=/usr/lib/0ad \
     --datadir=/usr/share/0ad/data \
     --without-pch \
-    --without-tests \
-    --without-nvtt
+
 cd gcc
 ub_make
diff --git a/0ad/patches/desktop-fix.patch b/0ad/patches/desktop-fix.patch
new file mode 100644
index 000000000..19ccf913e
--- /dev/null
+++ b/0ad/patches/desktop-fix.patch
@@ -0,0 +1,17 @@
+diff -Nur orig/build/resources/0ad.desktop mod/build/resources/0ad.desktop
+--- orig/build/resources/0ad.desktop	2016-11-14 10:50:36.000000000 +0100
++++ mod/build/resources/0ad.desktop	2017-10-30 08:50:47.552172348 +0100
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Version=1.0
+ Name=0 A.D.
+ Exec=0ad
+ Icon=0ad
+@@ -10,6 +9,7 @@
+ Comment[de]=Ein Echtzeitstrategiespiel, das die Kriegsführung der Antike behandelt
+ Comment[es]=Un juego de estrategia en tiempo real de guerra antigua
+ Comment[fr]=Un jeu de statégie militaire en temps réel dans l'Antiquité
++Comment[hu]=Történelmi stratégiai játék
+ Comment[it]=Videogioco strategico in tempo reale di guerre antiche
+ Comment[nl]=Een real-time strategie spel over oorlog van de oudheid
+ Comment[pl]=Gra strategiczna czasu rzeczywistego  o wojnach starożytnych
diff --git a/0ad/patches/includelist.patch b/0ad/patches/includelist.patch
deleted file mode 100644
index fc18dee74..000000000
--- a/0ad/patches/includelist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur orig/source/graphics/ParticleManager.h mod/source/graphics/ParticleManager.h
---- orig/source/graphics/ParticleManager.h	2021-02-06 01:27:21.000000000 +0100
-+++ mod/source/graphics/ParticleManager.h	2021-02-21 18:50:42.264749020 +0100
-@@ -22,6 +22,7 @@
- #include "graphics/ParticleEmitterType.h"
- 
- #include <boost/random/mersenne_twister.hpp>
-+#include <list>
- #include <unordered_map>
- 
- class SceneCollector;
diff --git a/0ad/patches/spidermonkey-no-optimize.patch b/0ad/patches/spidermonkey-no-optimize.patch
new file mode 100644
index 000000000..2c9e0f503
--- /dev/null
+++ b/0ad/patches/spidermonkey-no-optimize.patch
@@ -0,0 +1,12 @@
+diff -Nur orig/libraries/source/spidermonkey/build.sh mod/libraries/source/spidermonkey/build.sh
+--- orig/libraries/source/spidermonkey/build.sh	2016-10-04 17:01:34.000000000 +0200
++++ mod/libraries/source/spidermonkey/build.sh	2017-06-09 14:54:56.950183291 +0200
+@@ -110,7 +110,7 @@
+ perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-release'\''/' moz.build
+ mkdir -p build-release
+ cd build-release
+-CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-optimize  # --enable-gczeal --enable-debug-symbols
++CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --disable-optimize  # --enable-gczeal --enable-debug-symbols
+ ${MAKE} ${MAKE_OPTS}
+ cd ..
+ 
diff --git a/0ad/version b/0ad/version
index e04f8ade2..aebe4d5a7 100644
--- a/0ad/version
+++ b/0ad/version
@@ -1 +1 @@
-0.0.24~alpha
+0.0.23~alpha