diff --git a/README b/README
index ecace49..c936841 100644
--- a/README
+++ b/README
@@ -41,7 +41,7 @@ The following tools are implemented ('*' == finished, '#' == UTF-8 support,
 =*| link            yes                          none
 =*| ln              yes                          none
 =*| logger          yes                          none
-=*  logname         yes                          none
+=*| logname         yes                          none
 =   ls              no                           (-C), -S, -f, -m, -s, -x
 =*| md5sum          non-posix                    none
 =*| mkdir           yes                          none
diff --git a/logname.c b/logname.c
index f1981a5..11d287b 100644
--- a/logname.c
+++ b/logname.c
@@ -4,17 +4,26 @@
 
 #include "util.h"
 
+static void
+usage(void)
+{
+	eprintf("usage: %s\n", argv0);
+}
+
 int
 main(int argc, char *argv[])
 {
 	char *login;
 
-	argv0 = argv[0];
-	if (argc != 1)
-		eprintf("usage: %s\n", argv0);
+	argv0 = argv[0], argc--, argv++;
+
+	if (argc)
+		usage();
+
 	if ((login = getlogin()))
 		puts(login);
 	else
-		eprintf("%s: no login name\n", argv0);
+		eprintf("no login name\n");
+
 	return 0;
 }