diff --git a/repos/base-pistachio/patches/gcc8.patch b/repos/base-pistachio/patches/gcc8.patch
new file mode 100644
index 000000000..2a182c63b
--- /dev/null
+++ b/repos/base-pistachio/patches/gcc8.patch
@@ -0,0 +1,15 @@
+Fix GCC 8 compile error
+
+diff --git a/user/include/l4/kip.h b/user/include/l4/kip.h
+index 63e5b62..4a8bd6e 100644
+--- a/user/include/l4/kip.h
++++ b/user/include/l4/kip.h
+@@ -558,7 +558,7 @@ L4_INLINE L4_Bool_t L4_HasFeature (const char *feature_name)
+     void *kip = L4_GetKernelInterface();
+     char *name;
+ 
+-    for( L4_Word_t i = 0; (name = L4_Feature(kip,i)) != '\0'; i++ )
++    for( L4_Word_t i = 0; (name = L4_Feature(kip,i)) != 0; i++ )
+     {
+         const char *n = name;
+         const char *fn = feature_name;
diff --git a/repos/base-pistachio/ports/pistachio.hash b/repos/base-pistachio/ports/pistachio.hash
index d4723c632..55aac81ec 100644
--- a/repos/base-pistachio/ports/pistachio.hash
+++ b/repos/base-pistachio/ports/pistachio.hash
@@ -1 +1 @@
-964a28dc3463447e4245390233ba9f9d08191b21
+7f32b6b4051d381006d12e2e4c6a14f691d0ceae