diff --git a/ChangeLog b/ChangeLog
index 1715304f..e7fdeb13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-28  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/grpconv.c, src/groups.c: Name the parameters in the
+	prototypes of the static functions.
+	* src/grpconv.c: Fail if unexpected parameters are provided.
+	* src/grpconv.c: Indicate that argc is not used in the no
+	SHADOWGRP version.
+
 2008-08-28  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/chgpasswd.c, src/chpasswd.c: Removed variable ok, which is
diff --git a/src/grpconv.c b/src/grpconv.c
index 6c889bbd..f1efeb37 100644
--- a/src/grpconv.c
+++ b/src/grpconv.c
@@ -58,7 +58,7 @@ static bool sgr_locked = false;
 static char *Prog;
 
 /* local function prototypes */
-static void fail_exit (int);
+static void fail_exit (int status);
 
 static void fail_exit (int status)
 {
@@ -88,6 +88,9 @@ int main (int argc, char **argv)
 	const struct sgrp *sg;
 	struct sgrp sgent;
 
+	if (1 != argc) {
+		(void) fputs (_("Usage: grpconv\n"), stderr);
+	}
 	Prog = Basename (argv[0]);
 
 	(void) setlocale (LC_ALL, "");
@@ -218,7 +221,7 @@ int main (int argc, char **argv)
 	return 0;
 }
 #else				/* !SHADOWGRP */
-int main (int argc, char **argv)
+int main (int unused(argc), char **argv)
 {
 	fprintf (stderr,
 		 "%s: not configured for shadow group support.\n", argv[0]);