diff --git a/BUILD.gn b/BUILD.gn
index b6a6fa3882017c5c710040c9bec38ed8cc3f33fb..66650948acff7523e0e4ec16f9a4e03394aa51f8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -20,6 +20,8 @@ config("elfutils_defaults") {
     "_GNU_SOURCE",
     "NMNES=1000",
   ]
+
+  cflags = [ "-std=gnu99" ]
 }
 
 config("elfutils_public_config") {
diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
index c0f8dfa4aef2cf5c2894993cf0755e4ff8c98857..58c0c417a59721d865cf88dfb9c4211df70a72e3 100644
--- a/libdwfl/linux-kernel-modules.c
+++ b/libdwfl/linux-kernel-modules.c
@@ -1008,7 +1008,7 @@ dwfl_linux_kernel_report_modules (Dwfl *dwfl)
   int result = 0;
   Dwarf_Addr modaddr;
   unsigned long int modsz;
-  char modname[128];
+  char modname[128+1];
   char *line = NULL;
   size_t linesz = 0;
   /* We can't just use fscanf here because it's not easy to distinguish \n