diff --git a/lib/ChangeLog b/lib/ChangeLog
index b42f461..05cf293 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-04 Paul Jakma <paul@dishone.st>
+
+        * type mismatch fixes
+        
 2004-05-18 Hasso Tepper <hasso@estpak.ee>
 	
 	* pqueue.[c|h]: Added as part of ospf6d merge from Zebra repository.
diff --git a/lib/buffer.c b/lib/buffer.c
index de51ee3..0fffdfd 100644
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -149,7 +149,7 @@
 
 /* Write data to buffer. */
 int
-buffer_write (struct buffer *b, u_char *ptr, size_t size)
+buffer_write (struct buffer *b, void *ptr, size_t size)
 {
   struct buffer_data *data;
 
@@ -205,12 +205,12 @@
 
 /* Put string to the buffer. */
 int
-buffer_putstr (struct buffer *b, u_char *c)
+buffer_putstr (struct buffer *b, char *c)
 {
   size_t size;
 
-  size = strlen ((char *)c);
-  buffer_write (b, c, size);
+  size = strlen (c);
+  buffer_write (b, (void *) c, size);
   return 1;
 }
 
diff --git a/lib/buffer.h b/lib/buffer.h
index 7449aa7..eaf4b88 100644
--- a/lib/buffer.h
+++ b/lib/buffer.h
@@ -63,11 +63,11 @@
 
 /* Buffer prototypes. */
 struct buffer *buffer_new (size_t);
-int buffer_write (struct buffer *, u_char *, size_t);
+int buffer_write (struct buffer *, void *, size_t);
 void buffer_free (struct buffer *);
 char *buffer_getstr (struct buffer *);
 int buffer_putc (struct buffer *, u_char);
-int buffer_putstr (struct buffer *, u_char *);
+int buffer_putstr (struct buffer *, char *);
 void buffer_reset (struct buffer *);
 int buffer_flush_all (struct buffer *, int);
 int buffer_flush_vty_all (struct buffer *, int, int, int);
diff --git a/lib/zebra.h b/lib/zebra.h
index 997237d..30377fd 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -337,7 +337,7 @@
 
 /* AFI and SAFI type. */
 typedef u_int16_t afi_t;
-typedef u_char safi_t;
+typedef u_int8_t safi_t;
 
 /* Zebra types. */
 typedef u_int16_t zebra_size_t;