diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 8a3a5324b813..f7652ab20a35 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $Id: ipcrm.1,v 1.3 1997/02/22 19:55:11 peter Exp $
+.\" $Id: ipcrm.1,v 1.4 1997/06/23 04:52:05 steve Exp $
 .\""
 .Dd August 8, 1994
 .Dt ipcrm 1
@@ -31,7 +31,7 @@
 .Nd remove the specified message queues, semaphore sets, and shared memory
 segments
 .Sh SYNOPSIS
-.Nm ipcrm
+.Nm
 .Op Fl q Ar msqid
 .Op Fl m Ar shmid
 .Op Fl s Ar semid
@@ -40,7 +40,7 @@ segments
 .Op Fl S Ar semkey
 .Ar ...
 .Sh DESCRIPTION
-.Nm ipcrm
+.Nm Ipcrm
 removes the specified message queues, semaphores and shared memory
 segments.  These System V IPC objects can be specified by their
 creation id or any associated key.
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 717c82658c11..cca197e0bc8e 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -27,15 +27,19 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#include <ctype.h>
+#include <err.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <err.h>
-#include <signal.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
@@ -50,8 +54,9 @@ int signaled;
 
 void usage()
 {
-        fprintf(stderr, "usage: ipcrm [ [-q msqid] [-m shmid] [-s semid]\n");
-	fprintf(stderr, "        [-Q msgkey] [-M shmkey] [-S semkey] ...]\n");
+	fprintf(stderr, "%s\n%s\n",
+		"usage: ipcrm [-q msqid] [-m shmid] [-s semid]",
+		"             [-Q msgkey] [-M shmkey] [-S semkey] ...");
 	exit(1);
 }