diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD
index b4ec0464d..5b4742774 100644
--- a/main/postmarketos-ui-i3wm/APKBUILD
+++ b/main/postmarketos-ui-i3wm/APKBUILD
@@ -1,17 +1,19 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=postmarketos-ui-i3wm
-pkgver=0.4
-pkgrel=4
+pkgver=0.5
+pkgrel=0
 pkgdesc="(X11) Tiling WM (keyboard required)"
 url="https://i3wm.org"
 arch="noarch"
 license="GPL-3.0-or-later"
+source="i3wm-pmos i3-exec"
 depends="
 	dmenu-virtual
 	dnsmasq
 	elogind
 	elogind-openrc
+	feh
 	i3status
 	i3wm
 	tinydm
@@ -33,4 +35,13 @@ build() {
 
 package() {
 	mkdir -p "$pkgdir"
+	install -D -m644 "$srcdir"/i3wm-pmos \
+		"$pkgdir"/usr/share/i3/config.pmos
+	replaces="i3wm"
+	install -Dm644 "$srcdir"/i3-exec \
+		"$pkgdir"/usr/share/xsessions/i3.desktop
 }
+sha512sums="
+82ecd725d9fb06b44992bc6b6be63c620f61015f4fd0687cf0ab66fbfa632b40ef9c9001bf309ae872aa3ae01db0cd26ee74bcfe2d8249782faae3372ed38a10  i3wm-pmos
+5160619693a52a1e5d62008abb0b756efb072368120dc72a0d598083aa291fd50d39abc40465950193782467d6a7f80be9934cd058f81596038336fa07e90206  i3-exec
+"
diff --git a/main/postmarketos-ui-i3wm/i3-exec b/main/postmarketos-ui-i3wm/i3-exec
new file mode 100644
index 000000000..fa3d34232
--- /dev/null
+++ b/main/postmarketos-ui-i3wm/i3-exec
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=i3
+Comment=improved dynamic tiling window manager
+Exec=i3 -c /usr/share/i3/config.pmos
+TryExec=i3
+Type=Application
+X-LightDM-DesktopName=i3
+DesktopNames=i3
+Keywords=tiling;wm;windowmanager;window;manager;
diff --git a/main/postmarketos-ui-i3wm/i3wm-pmos b/main/postmarketos-ui-i3wm/i3wm-pmos
new file mode 100644
index 000000000..f50bc3d38
--- /dev/null
+++ b/main/postmarketos-ui-i3wm/i3wm-pmos
@@ -0,0 +1,6 @@
+# This config is primarily to support setting a common wallpaper for pmOS UIs.
+# General i3 configuration should still be done in ~/.config/
+exec --no-startup-id feh --no-fehbg --bg-fill /usr/share/wallpapers/postmarketos.jpg
+# Always ensure the `include` line is last, due to the way file inclusion is
+# implemented in i3. See https://i3wm.org/docs/userguide.html#include.
+include $HOME/.config/i3/config
diff --git a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-install b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-install
index 101287c5a..d9ed038a7 100644
--- a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-install
+++ b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-install
@@ -4,3 +4,4 @@ rc-update add tinydm default
 tinydm-set-session -s /usr/share/xsessions/i3.desktop
 rc-update add elogind default
 rc-update add networkmanager default
+install -Dm 644 -t /etc/skel/.config/i3/ /etc/i3/config