diff --git a/README b/README
index af9b175..759865c 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ The following tools are implemented ('*' == finished, '#' == UTF-8 support,
 =* date            yes                             none
 =* dirname         yes                             none
 =  du              no                              -H, -L, (-x)
-=  echo            yes                             none
+=* echo            yes                             none
 =  env             yes                             none
 #  expand          yes                             none
    expr            yes                             none
diff --git a/echo.1 b/echo.1
index cbe4762..db333f9 100644
--- a/echo.1
+++ b/echo.1
@@ -1,14 +1,30 @@
-.TH ECHO 1 sbase\-VERSION
-.SH NAME
-echo \- print arguments
-.SH SYNOPSIS
-.B echo
-.RB [ \-n ]
-.RI [ string ...]
-.SH DESCRIPTION
-.B echo
-prints its arguments to stdout, separated by spaces and terminated by a newline.
-.SH OPTIONS
-.TP
-.B \-n
-Do not print terminating newline.
+.Dd January 23, 2015
+.Dt ECHO 1 sbase\-VERSION
+.Sh NAME
+.Nm echo
+.Nd print arguments
+.Sh SYNOPSIS
+.Nm echo
+.Op Fl n
+.Op Ar string ...
+.Sh DESCRIPTION
+.Nm
+prints each
+.Ar string
+to stdout, separated by spaces and terminated by
+a newline.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl n
+Do not print the terminating newline.
+.El
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2008
+specification.
+.Pp
+The
+.Op Fl n
+flag is an extension to that specification.
diff --git a/echo.c b/echo.c
index 6656ac4..e96fc53 100644
--- a/echo.c
+++ b/echo.c
@@ -7,7 +7,7 @@
 static void
 usage(void)
 {
-	eprintf("usage: %s [-n] text\n", argv0);
+	eprintf("usage: %s [-n] [string ...]\n", argv0);
 }
 
 int