diff --git a/usr.bin/false/Makefile b/usr.bin/false/Makefile
index ed511ab247ba..891e5349dec3 100644
--- a/usr.bin/false/Makefile
+++ b/usr.bin/false/Makefile
@@ -1,5 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	false
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index 3bb8c0041914..11d69ae68657 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.c
@@ -29,19 +29,22 @@
  * 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.
+ *
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)false.c	8.1 (Berkeley) 6/6/93";
+static const char sccsid[] = "@(#)false.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
+int
 main()
 {
-	exit(1);
+	return 1;
 }
diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile
index 028a6ca75c9f..8ad6095741be 100644
--- a/usr.bin/true/Makefile
+++ b/usr.bin/true/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	true
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/true/true.c b/usr.bin/true/true.c
index 0847cfa22568..ac17b6cce8a0 100644
--- a/usr.bin/true/true.c
+++ b/usr.bin/true/true.c
@@ -29,19 +29,22 @@
  * 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.
+ *
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)true.c	8.1 (Berkeley) 6/9/93";
+static const char sccsid[] = "@(#)true.c	8.1 (Berkeley) 6/9/93";
 #endif /* not lint */
 
+int
 main()
 {
-	exit(0);
+	return 0;
 }