diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1618dd8..7511cdf 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-30 Paul Jakma <paul.jakma@sun.com>
+
+	* command.h: (DEFUN_CMD_FUNC_TEXT) Annotate arguments as
+	  potentially being unused.
+
 2006-03-27 Paul Jakma <paul.jakma@sun.com>
 
 	* memtypes.awk: Fix gensub call, g should be a string..
diff --git a/lib/command.h b/lib/command.h
index fbe6a0a..26013e2 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -183,7 +183,10 @@
 
 #define DEFUN_CMD_FUNC_TEXT(funcname) \
   static int funcname \
-    (struct cmd_element *self, struct vty *vty, int argc, const char *argv[])
+    (struct cmd_element *self __attribute__ ((unused)), \
+     struct vty *vty __attribute__ ((unused)), \
+     int argc __attribute__ ((unused)), \
+     const char *argv[] __attribute__ ((unused)) )
 
 /* DEFUN for vty command interafce. Little bit hacky ;-). */
 #define DEFUN(funcname, cmdname, cmdstr, helpstr) \