diff --git a/satellites/i3.sat b/satellites/i3.sat
index 5fdc363..87df126 100644
--- a/satellites/i3.sat
+++ b/satellites/i3.sat
@@ -1,24 +1,25 @@
 import 'compile/configure'
 
 name=i3
-version=4.14.1
+version=4.15
 
 define_option '!gaps: Use the i3-gaps fork'
 define_option '!patch: Apply some custom patches'
 
 if option gaps; then
+    version+=.0.1
     dlextract "https://github.com/Airblader/$name/archive/$version/$name-gaps-$version.tar.gz" \
-              '45e0bde55cc3868bf3ed8608b2ee673b'
+              'eab76b0d30964ec619364e9a8f51819f'
 else
     dlextract "http://i3wm.org/downloads/$name-$version.tar.bz2" \
-              '0f4eec9e5a9f7be060bda41206b13f87'
+              '6ff0e7d59cf6983af68f9b4cdaf2a641'
 fi
-option patch extrafile "$name-$version-window-icons.patch"
+option patch extrafile "$name-4.14.1-window-icons.patch"
 _
 
 cd "$name-$version"
 
-option patch patch -p0 -i "../$name-$version-window-icons.patch"
+option patch patch -p0 -i "../$name-4.14.1-window-icons.patch"
 
 if option gaps; then
     autoreconf -fi
diff --git a/satellites/i3status.sat b/satellites/i3status.sat
index 748c0ed..72a79d6 100644
--- a/satellites/i3status.sat
+++ b/satellites/i3status.sat
@@ -1,14 +1,17 @@
+# PATHS: Fix hardcoded paths
+# PATCH: Support the absence of pulseaudio
+
 name=i3status
-version=2.11
+version=2.12
 
 dlextract "https://i3wm.org/$name/$name-$version.tar.bz2" \
-          'a5c0a364d917ffc57c42af3f6936e700'
-extrafile "$name-$version-disable-pulseaudio.patch"
+          'ed839f1626781aaca236b46693fab975'
+extrafile "$name-2.11-disable-pulseaudio.patch"
 _
 
 cd "$name-$version"
 
-pkg-config --exists libpulse || patch -p0 -i "../$name-$version-disable-pulseaudio.patch"
+pkg-config --exists libpulse || patch -p0 -i "../$name-2.11-disable-pulseaudio.patch"
 
 # Fix paths
 sed -i -e "/install -m/s/bin/$(safe_sed "$dir_bin")/" \