diff --git a/snap/scripts/launcher b/scripts/launcher
similarity index 100%
rename from snap/scripts/launcher
rename to scripts/launcher
diff --git a/snap/scripts/share/minetest/misc/minetest-xorg-icon-128.png b/scripts/share/minetest/misc/minetest-xorg-icon-128.png
similarity index 100%
rename from snap/scripts/share/minetest/misc/minetest-xorg-icon-128.png
rename to scripts/share/minetest/misc/minetest-xorg-icon-128.png
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7e23929..c7c6e4d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -12,6 +12,13 @@ version: stable
 version-script: git -C parts/minetest/src describe --tags | cut -d- -f1
 base: core18
 
+architectures:
+  - build-on: amd64
+  - build-on: arm64
+  - build-on: armhf
+  - build-on: i386
+  - build-on: ppc64el
+
 apps:
   minetest:
     command: launcher
@@ -22,7 +29,7 @@ apps:
 
 parts:
   launcher:
-    source: snap/scripts
+    source: scripts
     plugin: dump
   minetestgame:
     source: https://github.com/minetest/minetest_game.git
@@ -30,24 +37,30 @@ parts:
     plugin: dump
     organize:
       '*': 'share/minetest/games/minetest_game/'
+  irrlicht:
+    source: https://github.com/minetest/irrlicht.git
+    source-branch: master
+    plugin: cmake
+    override-pull: |
+      snapcraftctl pull
+      tag=$(git describe --tags $(git rev-list --tags --max-count=1))
+      git checkout "$tag"
   minetest:
     source: https://github.com/minetest/minetest.git
     source-branch: stable-5
     plugin: cmake
     configflags: ["-DRUN_IN_PLACE=FALSE", "-DCMAKE_BUILD_TYPE=Release"]
+    after:
+      - irrlicht
     build-packages:
       - cmake
       - gcc
       - g++
       - gettext
-      - imagemagick
-      - libbz2-dev
       - libcurl4-gnutls-dev
       - libfreetype6-dev
       - libglu1-mesa-dev
-      - libirrlicht-dev
       - libjpeg-dev
-      - libjsoncpp-dev
       - libleveldb-dev
       - libluajit-5.1-dev
       - libogg-dev
@@ -63,7 +76,6 @@ parts:
       - libpulse0
       - libcurl3-gnutls
       - libgl1-mesa-glx
-      - libirrlicht1.8
       - libxshmfence1
       - libxcb-sync1
       - libxcb-present0