diff --git a/lib/ChangeLog b/lib/ChangeLog
index e1f4118..5788380 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-26 Paul Jakma <paul.jakma@sun.com>
+
+	* buffer.c: (struct buffer_data) change gcc zero array
+	  declaration to C99 incomplete array.
+	* stream.h: (struct stream) same
+
 2005-11-24 Paul Jakma <paul.jakma@sun.com>
 
 	* privs.c: (zcaps2sys/solaris) remove unused variable.
diff --git a/lib/buffer.c b/lib/buffer.c
index 81cd0f2..f19a9e0 100644
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -53,7 +53,7 @@
   size_t sp;
 
   /* Actual data stream (variable length). */
-  unsigned char data[0];  /* real dimension is buffer->size */
+  unsigned char data[];  /* real dimension is buffer->size */
 };
 
 /* It should always be true that: 0 <= sp <= cp <= size */
diff --git a/lib/stream.h b/lib/stream.h
index 4753f82..564fa3c 100644
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -103,7 +103,7 @@
   size_t getp; 		/* next get position */
   size_t endp;		/* last valid data position */
   size_t size;		/* size of data segment */
-  unsigned char data[0]; /* data pointer */
+  unsigned char data[]; /* data pointer */
 };
 
 /* First in first out queue structure. */
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index d202e29..064ed83 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-26 Paul Jakma <paul.jakma@sun.com>
+
+	* ospf_api.c: (struct opaque_lsa) change from gcc zero-length
+	  array to C99 incomplete type array.
+
 2005-11-20 Paul Jakma <paul.jakma@sun.com>
 
         * ospfd.h: remove the OSPF_ROUTER_ID_UPDATE_DELAY define
diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c
index d9960d4..9c9997b 100644
--- a/ospfd/ospf_api.c
+++ b/ospfd/ospf_api.c
@@ -68,7 +68,7 @@
   struct opaque_lsa
   {
     struct lsa_header header;
-    u_char mydata[0];
+    u_char mydata[];
   };
 
   struct opaque_lsa *olsa;