diff --git a/Changes b/Changes
index fa3f4572c..cb8db14c9 100644
--- a/Changes
+++ b/Changes
@@ -533,3 +533,4 @@
 - Fixed a problem where doing ./unreal restart multiple times would not actually restart
   the ircd (#0002120) reported by SineSwiper.
 - Made it so +f notices are sent to %#chan, not @%#chan (#0002248) reported by aquanight.
+- Hopefully fixed the last of the alloca warnings (#0002202) reported by Stoebi.
diff --git a/include/sys.h b/include/sys.h
index bec74a6e2..858b15335 100644
--- a/include/sys.h
+++ b/include/sys.h
@@ -24,21 +24,21 @@
 
 /* alloca stuff */
 #ifdef _WIN32
-#include <malloc.h>
-#define alloca _alloca
-#else
-# if defined(__GNUC__) && !defined(alloca)
-#  define alloca __builtin_alloca
-# else
-#  if HAVE_ALLOCA_H
+# include <malloc.h>
+# define alloca _alloca
+#else /* _WIN32 */
+# ifdef HAVE_ALLOCA
+#  if defined(_AIX) && !defined(__GNUC__)
+    #pragma alloca
+#  endif /* _AIX */
+#  if defined(HAVE_ALLOCA_H)
 #   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   endif
-#  endif
-# endif
-#endif
+#  endif /* HAVE_ALLOCA_H */
+#  if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && !defined(alloca)
+#   define alloca __builtin_alloca
+#  endif /* __GNUC__ */
+# endif /* HAVE_ALLOCA */
+#endif /* !_WIN32 */
 
 #ifdef ISC202
 #include <net/errno.h>