diff --git a/lib/ChangeLog b/lib/ChangeLog
index d258ab3..9a01f63 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-11 Hasso Tepper <hasso at quagga.net>
+
+	* command.h: Sync DEFUNSH with other macros.
+	* sockunion.c, sockunion.h: More const strings.
+
 2004-10-11 Paul Jakma <paul@dishone.st>
 
 	* thread.c: (funcname_thread_add_timer) 
diff --git a/lib/command.h b/lib/command.h
index 0f806c8..a838734 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -192,7 +192,7 @@
 
 /* DEFUN + DEFSH */
 #define DEFUNSH(daemon, funcname, cmdname, cmdstr, helpstr) \
-  int funcname (struct cmd_element *, struct vty *, int, char **); \
+  int funcname (struct cmd_element *, struct vty *, int, const char *[]); \
   struct cmd_element cmdname = \
   { \
     cmdstr, \
@@ -201,7 +201,7 @@
     daemon \
   }; \
   int funcname \
-  (struct cmd_element *self, struct vty *vty, int argc, char **argv)
+  (struct cmd_element *self, struct vty *vty, int argc, const char *argv[])
 
 /* ALIAS macro which define existing command's alias. */
 #define ALIAS(funcname, cmdname, cmdstr, helpstr) \
diff --git a/lib/sockunion.c b/lib/sockunion.c
index 587b324..eb29ced 100644
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -133,7 +133,7 @@
 }
 
 int
-str2sockunion (char *str, union sockunion *su)
+str2sockunion (const char *str, union sockunion *su)
 {
   int ret;
 
diff --git a/lib/sockunion.h b/lib/sockunion.h
index 99bdf6a..92e536c 100644
--- a/lib/sockunion.h
+++ b/lib/sockunion.h
@@ -87,7 +87,7 @@
 #define sockunion_family(X)  (X)->sa.sa_family
 
 /* Prototypes. */
-int str2sockunion (char *, union sockunion *);
+int str2sockunion (const char *, union sockunion *);
 const char *sockunion2str (union sockunion *, char *, size_t);
 int sockunion_cmp (union sockunion *, union sockunion *);
 int sockunion_same (union sockunion *, union sockunion *);