diff --git a/repos/base-fiasco/lib/mk/kernel-fiasco.inc b/repos/base-fiasco/lib/mk/kernel-fiasco.inc
index 70eb7b21cb..d88629577a 100644
--- a/repos/base-fiasco/lib/mk/kernel-fiasco.inc
+++ b/repos/base-fiasco/lib/mk/kernel-fiasco.inc
@@ -6,8 +6,15 @@ FIASCO_SRC       = $(L4_SRC_DIR)/kernel/fiasco
 
 KERNEL_BUILD_OUTPUT_FILTER = 2>&1 | sed "s/^/      [fiasco]  /"
 
-KERNEL_CXXFLAGS = -std=gnu++98 -fno-delete-null-pointer-checks $(CXXWARN) \
-                  -Wno-address-of-packed-member
+KERNEL_CFLAGS = -std=gnu89 \
+                -fno-tree-loop-distribute-patterns \
+                $(CWARN)
+
+KERNEL_CXXFLAGS = -std=gnu++98 \
+                  -fno-delete-null-pointer-checks \
+                  -fno-tree-loop-distribute-patterns \
+                  -Wno-address-of-packed-member \
+                  $(CXXWARN)
 
 $(FIASCO_BUILD_DIR):
 	$(VERBOSE_MK) MAKEFLAGS= $(MAKE) SYSTEM_TARGET="$(CROSS_DEV_PREFIX)" \
@@ -20,7 +27,8 @@ $(FIASCO_BUILD_DIR):
 	$(VERBOSE)cp $(KERNEL_CONFIG) $@/globalconfig.out
 
 $(FIASCO): $(FIASCO_BUILD_DIR)
-	$(VERBOSE_MK) MAKEFLAGS= CFLAGS="-std=gnu89 $(CWARN)" \
+	$(VERBOSE_MK) MAKEFLAGS= \
+	              CFLAGS="$(KERNEL_CFLAGS)" \
 	              CXXFLAGS="$(KERNEL_CXXFLAGS)" \
 	              $(MAKE) SYSTEM_TARGET="$(CROSS_DEV_PREFIX)" \
 	                                 $(VERBOSE_DIR) -C $(FIASCO_BUILD_DIR) \
diff --git a/repos/base-fiasco/lib/mk/l4_pkg.inc b/repos/base-fiasco/lib/mk/l4_pkg.inc
index 91125d8e64..9eae61bb11 100644
--- a/repos/base-fiasco/lib/mk/l4_pkg.inc
+++ b/repos/base-fiasco/lib/mk/l4_pkg.inc
@@ -65,8 +65,10 @@ CXXWARN = $(WARN) -Wno-bool-compare -Wno-c++11-compat -Wno-class-memaccess
 #
 %.tag:
 	$(VERBOSE_MK) MAKEFLAGS= CPPFLAGS="$(CC_MARCH)" \
-	              CFLAGS="$(CC_MARCH) -std=gnu89 $(CWARN)" \
-	              CXXFLAGS="$(CC_MARCH) -D_GNU_SOURCE -std=gnu++98 $(CXXWARN)" \
+	              CFLAGS="$(CC_MARCH) -std=gnu89 $(CWARN) \
+	                      -fno-tree-loop-distribute-patterns" \
+	              CXXFLAGS="$(CC_MARCH) -D_GNU_SOURCE -std=gnu++98 $(CXXWARN) \
+	                        -fno-tree-loop-distribute-patterns" \
 	              ASFLAGS="$(CC_MARCH)" LDFLAGS="$(LD_MARCH)" \
 	              $(MAKE) $(VERBOSE_DIR) O=$(L4_BUILD_DIR) $(L4_VERBOSE) \
 	                      -C $(L4_PKG_DIR)/$* \
diff --git a/repos/base-fiasco/patches/gcc12.patch b/repos/base-fiasco/patches/gcc12.patch
new file mode 100644
index 0000000000..e44ca1a893
--- /dev/null
+++ b/repos/base-fiasco/patches/gcc12.patch
@@ -0,0 +1,15 @@
+gcc12.patch
+
+diff --git fiasco/snapshot/l4/pkg/sigma0/server/src/region.h fiasco/snapshot/l4/pkg/sigma0/server/src/region.h
+index ad7cf95..c323bae 100644
+--- fiasco/snapshot/l4/pkg/sigma0/server/src/region.h
++++ fiasco/snapshot/l4/pkg/sigma0/server/src/region.h
+@@ -1,6 +1,8 @@
+ #ifndef SIGMA0_REGION_H__
+ #define SIGMA0_REGION_H__
+ 
++#include <l4/cxx/iostream.h>
++
+ class Region
+ {
+ private:
diff --git a/repos/base-fiasco/ports/fiasco.hash b/repos/base-fiasco/ports/fiasco.hash
index 63e6ca928c..822c5efe57 100644
--- a/repos/base-fiasco/ports/fiasco.hash
+++ b/repos/base-fiasco/ports/fiasco.hash
@@ -1 +1 @@
-386db79cbd4039ea2e3cbf028fac095a1bc96c31
+3cad5953cefcd6818145ea05f96bf7b37efa5024