diff --git a/ChangeLog b/ChangeLog
index 422ff3c..ff49388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-14 Paul Jakma <paul.jakma@sun.com>
+
+	* configure.ac: Tell gcc we like C99.
+	  [bug #231] Check and test for stdint.h.
+
 2005-11-11 Paul Jakma <paul.jakma@sun.com>
 
 	* NEWS: Update.
diff --git a/configure.ac b/configure.ac
index 60186d9..274ba7a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.114 2005/11/11 10:28:59 paul Exp $
+## $Id: configure.ac,v 1.115 2005/11/14 14:05:36 paul Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.99.2, [http://bugzilla.quagga.net])
@@ -88,7 +88,7 @@
 dnl
 if test "x$cflags_specified" = "x" ; then
   if test "x${GCC}" = "xyes" && test "x${ICC}" = "xno"; then
-  	CFLAGS="-Os -fno-omit-frame-pointer -g  -Wall"
+  	CFLAGS="-Os -fno-omit-frame-pointer -g -std=c99 -Wall"
   	CFLAGS="${CFLAGS} -Wsign-compare -Wpointer-arith"
   	CFLAGS="${CFLAGS} -Wbad-function-cast -Wwrite-strings"
   	CFLAGS="${CFLAGS} -Wmissing-prototypes -Wmissing-declarations"
@@ -324,7 +324,7 @@
 AC_CHECK_HEADERS([string.h stropts.h sys/conf.h sys/ksym.h sys/time.h \
                  sys/times.h sys/select.h sys/sysctl.h sys/sockio.h \
                  sys/types.h linux/version.h kvm.h netdb.h asm/types.h \
-                 sys/param.h libutil.h limits.h])
+                 sys/param.h libutil.h limits.h stdint.h])
 
 AC_CHECK_HEADERS([sys/socket.h netinet/in_systm.h netinet/in.h \
 		 net/if_dl.h net/netopt.h inet/nd.h net/route.h \
diff --git a/lib/ChangeLog b/lib/ChangeLog
index b6407c4..4293457 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -18,6 +18,7 @@
 	  Keep track of number of consecutive runs, go into 'overdrive'
 	  if queue is being flooded, we can't avoid making heavy use of 
 	  resources, better to use CPU than ever more RAM.
+	* zebra.h: [bug #231] include stdint, if its there.
 
 2005-11-05 Paul Jakma <paul.jakma@sun.com>
 
diff --git a/lib/zebra.h b/lib/zebra.h
index 1739d77..0aa98a4 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -82,6 +82,9 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif /* HAVE_LIMITS_H */
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif /* HAVE_STDINT_H */
 
 /* machine dependent includes */
 #ifdef SUNOS_5