diff --git a/srcpkgs/i3-gaps b/srcpkgs/i3-gaps
new file mode 120000
index 00000000000..41a6cd96475
--- /dev/null
+++ b/srcpkgs/i3-gaps
@@ -0,0 +1 @@
+i3
\ No newline at end of file
diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
deleted file mode 100644
index b7069a7f9fb..00000000000
--- a/srcpkgs/i3-gaps/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'i3-gaps'
-pkgname=i3-gaps
-version=4.21.1
-revision=1
-build_style=meson
-configure_args="-Dmans=true"
-hostmakedepends="pkg-config perl autoconf automake asciidoc pod2mdoc xmlto"
-makedepends="pcre2-devel yajl-devel libxcb-devel libev-devel
- pango-devel startup-notification-devel libxkbcommon-devel
- xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel
- xcb-util-xrm-devel"
-depends="perl-AnyEvent-I3"
-conf_files="/etc/i3/config /etc/i3/config.keycodes"
-short_desc="Improved tiling window manager - i3 fork with more features"
-maintainer="ian c. <ian@airmail.cc>"
-license="BSD-3-Clause"
-homepage="https://github.com/Airblader/i3"
-distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=83f9b375c70f015611216cfa56956945c5b731c9943c53f4e3d6dee305de54f6
-
-provides="i3-${version}_${revision}"
-replaces="i3>=0"
-
-do_check() {
-	:
-}
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/include
-	vlicense LICENSE
-}
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index 74a8ac62743..8aa47657e55 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,6 +1,6 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.21.1
+version=4.22
 revision=1
 build_style=meson
 hostmakedepends="pkg-config perl"
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
 homepage="https://i3wm.org/"
 changelog="https://i3wm.org/downloads/RELEASE-NOTES-${version}.txt"
 distfiles="https://i3wm.org/downloads/i3-${version}.tar.xz"
-checksum=edfd781285c654a05dc6db272ce0300c4428e6fbd875d99964e57de25b41bc1e
+checksum=28639911e59d95639f092642a982f5e1dea592250c2b5ce98eda100833513e4b
 make_check=no # Michael disables tests in Debian rules, too
 
 post_install() {
@@ -28,3 +28,9 @@ i3-devel_package() {
 		vmove usr/include
 	}
 }
+
+i3-gaps_package() {
+	build_style=meta
+	short_desc+=" - transitional dummy package"
+	depends="${sourcepkg}>=${version}_${revision}"
+}