diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index f17c173f261a..5184d7ba075c 100644
--- a/sbin/atm/Makefile
+++ b/sbin/atm/Makefile
@@ -1,10 +1,7 @@
-#
-#
 # ===================================
 # HARP  |  Host ATM Research Platform
 # ===================================
 #
-#
 # This Host ATM Research Platform ("HARP") file (the "Software") is
 # made available by Network Computing Services, Inc. ("NetworkCS")
 # "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -24,7 +21,6 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $FreeBSD$
-#
 
 SUBDIR=	atm \
 	fore_dnld \
diff --git a/sbin/atm/Makefile.inc b/sbin/atm/Makefile.inc
index dece1093d7b4..867148625c1d 100644
--- a/sbin/atm/Makefile.inc
+++ b/sbin/atm/Makefile.inc
@@ -1,10 +1,7 @@
-#
-#
 # ===================================
 # HARP  |  Host ATM Research Platform
 # ===================================
 #
-#
 # This Host ATM Research Platform ("HARP") file (the "Software") is
 # made available by Network Computing Services, Inc. ("NetworkCS")
 # "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -25,6 +22,5 @@
 #
 #	@(#) $FreeBSD$
 #
-#
 
 .include "../Makefile.inc"
diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index 494552d98428..000cdc7daa4a 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/atm/Makefile
@@ -1,10 +1,7 @@
-#
-#
 # ===================================
 # HARP  |  Host ATM Research Platform
 # ===================================
 #
-#
 # This Host ATM Research Platform ("HARP") file (the "Software") is
 # made available by Network Computing Services, Inc. ("NetworkCS")
 # "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -25,16 +22,16 @@
 #
 #	@(#) $FreeBSD$
 #
-#
 
 PROG=	atm
 SRCS=	atm.c atm_fore200.c atm_eni.c atm_inet.c atm_print.c \
 	atm_set.c atm_show.c atm_subr.c
 MAN=	atm.8
 
-CFLAGS+=	-I${.CURDIR}/../../../sys
-WARNS=		6
-LDADD+=		-latm
-DPADD+=		 ${LIBATM}
+WARNS?=	6
+CFLAGS+= -I${.CURDIR}/../../../sys
+
+DPADD=	${LIBATM}
+LDADD=	-latm
 
 .include <bsd.prog.mk>
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index fa951750962b..33bba06fbc75 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/Makefile
@@ -1,10 +1,7 @@
-#
-#
 # ===================================
 # HARP  |  Host ATM Research Platform
 # ===================================
 #
-#
 # This Host ATM Research Platform ("HARP") file (the "Software") is
 # made available by Network Computing Services, Inc. ("NetworkCS")
 # "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -25,15 +22,15 @@
 #
 #	@(#) $FreeBSD$
 #
-#
 
 PROG=	fore_dnld
 MAN=	fore_dnld.8
 SRCS=	fore_dnld.c pca200e.c
 
-CFLAGS+=	-I${.CURDIR}/../../../sys
-WARNS=	6
-LDADD+=		-latm
-DPADD+=		${LIBATM}
+WARNS?=	6
+CFLAGS+= -I${.CURDIR}/../../../sys
+
+DPADD=	${LIBATM}
+LDADD=	-latm
 
 .include <bsd.prog.mk>
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index d62231cac7d7..2428b6e801a8 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/Makefile
@@ -1,10 +1,7 @@
-#
-#
 # ===================================
 # HARP  |  Host ATM Research Platform
 # ===================================
 #
-#
 # This Host ATM Research Platform ("HARP") file (the "Software") is
 # made available by Network Computing Services, Inc. ("NetworkCS")
 # "AS IS".  NetworkCS does not provide maintenance, improvements or
@@ -25,14 +22,14 @@
 #
 #	@(#) $FreeBSD$
 #
-#
 
 PROG=	ilmid
 MAN=	ilmid.8
 
-CFLAGS+=	-I${.CURDIR}/../../../sys
-LDADD+=		-latm
-DPADD+=		${LIBATM}
-WARNS=		6
+WARNS?=	6
+CFLAGS+= -I${.CURDIR}/../../../sys
+
+DPADD=	${LIBATM}
+LDADD=	-latm
 
 .include <bsd.prog.mk>