diff --git a/helpers/DATA/gtk+3.0/000-fix_tooltip_gtk+3.0_lxde.patch b/helpers/DATA/gtk+3.0/patch_changes/000-fix_tooltip_gtk+3.0_lxde.patch
similarity index 100%
rename from helpers/DATA/gtk+3.0/000-fix_tooltip_gtk+3.0_lxde.patch
rename to helpers/DATA/gtk+3.0/patch_changes/000-fix_tooltip_gtk+3.0_lxde.patch
diff --git a/helpers/DATA/gtk+3.0/patch_changes/001-fix_FTBFS_on_armhf_ecne.patch b/helpers/DATA/gtk+3.0/patch_changes/001-fix_FTBFS_on_armhf_ecne.patch
new file mode 100644
index 0000000..392c34b
--- /dev/null
+++ b/helpers/DATA/gtk+3.0/patch_changes/001-fix_FTBFS_on_armhf_ecne.patch
@@ -0,0 +1,25 @@
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index d6db84fa..93ffc0af 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -71,6 +71,7 @@
+ 
+ #ifdef GDK_WINDOWING_X11
+ #include "x11/gdkx.h"
++#include <math.h>
+ #endif
+ 
+ #ifdef GDK_WINDOWING_WIN32
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index 93ffc0af..bfcef2b5 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -4182,7 +4182,7 @@ on_decoration_style_changed (GtkWidget *widget,
+                              GtkWindow *window)
+ {
+   GtkStyleContext *context = gtk_widget_get_style_context (widget);
+-  const GtkBitmask *change = gtk_style_context_get_change (context);
++  GtkCssStyleChange *change = gtk_style_context_get_change (context);
+ 
+   if (!change || !gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_BORDER))
+     return;
diff --git a/helpers/make-gtk+3.0 b/helpers/make-gtk+3.0
index f3fab9d..d343e86 100644
--- a/helpers/make-gtk+3.0
+++ b/helpers/make-gtk+3.0
@@ -22,8 +22,9 @@ VERSION=1
 . ./config
 
 # TODO: Keep an eye on this final fix to match changes accordingly.
+# - 000-fix_tooltip_gtk+3.0_lxde.patch
 # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8216
-patch_p1 $DATA/000-fix_tooltip_gtk+3.0_lxde.patch
+apply_patch_changes
 
 changelog "Apply fix for tooltip on lxde / trisquel-mini."