diff --git a/lib/ChangeLog b/lib/ChangeLog
index db3c546..b857b13 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-28 Paul Jakma <paul.jakma@sun.com>
+
+	* zebra.h: Include inttypes.h rather than stdint.h, best practice
+	  according to the autoconf manual.
+	  Add UINT*_MAX defines for older platforms lacking these (FBSD 4)
+
 2006-05-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* if.h: (struct connected) Document the meaning of the
diff --git a/lib/zebra.h b/lib/zebra.h
index bf7509e..2e2f8cd 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -82,9 +82,9 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif /* HAVE_LIMITS_H */
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif /* HAVE_STDINT_H */
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif /* HAVE_INTTYPES_H */
 
 /* machine dependent includes */
 #ifdef SUNOS_5
@@ -206,10 +206,27 @@
 #include <netinet6/nd6.h>
 #endif /* HAVE_NETINET6_ND6_H */
 
-/* Some systems do not define UINT32_MAX */
+/* Some systems do not define UINT32_MAX, etc.. from inttypes.h
+ * e.g. this makes life easier for FBSD 4.11 users.
+ */
+#ifndef INT8_MAX
+#define INT8_MAX	(127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX	(32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX	(2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX	(255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX	(65535U)
+#endif
 #ifndef UINT32_MAX
-#define UINT32_MAX 0xFFFFFFFFU
-#endif /* UINT32_MAX */
+#define UINT32_MAX	(4294967295U)
+#endif
 
 #ifdef HAVE_LIBUTIL_H
 #include <libutil.h>