diff --git a/.github/workflows/build+test.yml b/.github/workflows/build+test.yml
index 77a50b2..2ee2fab 100644
--- a/.github/workflows/build+test.yml
+++ b/.github/workflows/build+test.yml
@@ -49,6 +49,9 @@ jobs:
           username: neale
           password: ${{ secrets.DOCKER_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
       # Currently required, because buildx doesn't support auto-push from docker
       - name: Set up builder
         uses: docker/setup-buildx-action@v1
@@ -61,6 +64,7 @@ jobs:
           target: moth
           file: build/package/Containerfile
           push: true
+          platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le
           tags: |
             dirtbags/moth:${{ steps.vars.outputs.tag }}
             ghcr.io/dirtbags/moth:${{ steps.vars.outputs.tag }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2291c7a..ae1de8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [v4.1.0-pre] - Unreleased
+
+
+## [v4.0.2] - 2020-10-29
+### Added
+- Build multiarch Docker images
 ### Changed
 - Stop building devel server from this codebase; this is moving to a new repo
 
diff --git a/build/package/Containerfile b/build/package/Containerfile
index 7d8ee24..cbde82b 100644
--- a/build/package/Containerfile
+++ b/build/package/Containerfile
@@ -28,7 +28,7 @@ COPY --from=prodbuild /target /
 ENTRYPOINT [ "/bin/mothd" ]
 
 ##########
-
+# You should use the dirtbags/moth-devel repo's build for this, instead
 FROM ubuntu AS moth-devel
 RUN apt-get -y update && apt-get -y install \
     build-essential \