diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 18d46b622e2b..0a6cdb568e7f 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * The main module for truss.  Suprisingly simple, but, then, the other
@@ -129,7 +127,7 @@ set_etype(struct trussinfo *trussinfo) {
 
   if (funcs->type == NULL) {
     funcs = &ex_types[0];
-    warn("Execution type %s is not supported -- using %s\n",
+    warn("execution type %s is not supported -- using %s",
       progt, funcs->type);
   }
   return funcs;
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index aedd957a0593..2d252a75a093 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Various setup functions for truss.  Not the cleanest-written code,
@@ -45,7 +43,6 @@ static const char rcsid[] =
 #include <sys/wait.h>
 
 #include <err.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
@@ -115,7 +112,7 @@ setup_and_wait(char *command[]) {
   if (ioctl(fd, PIOCWAIT, &pfs) == -1)
     err(6, "PIOCWAIT");
   if (pfs.why == S_EXIT) {
-    fprintf(stderr, "process exited before exec'ing\n");
+    warnx("process exited before exec'ing");
     ioctl(fd, PIOCCONT, 0);
     wait(0);
     exit(7);