diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 9825183d33e..f569f7a2991 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,44 +1,42 @@
 # $FreeBSD$
 #
-.PATH:			${.CURDIR}/${MACHINE_ARCH}
-BASE_SRCS=		dict.c ficl.c fileaccess.c float.c loader.c math64.c \
-			prefix.c search.c stack.c tools.c vm.c words.c
+.PATH: ${.CURDIR}/${MACHINE_ARCH}
+BASE_SRCS=	dict.c ficl.c fileaccess.c float.c loader.c math64.c \
+		prefix.c search.c stack.c tools.c vm.c words.c
 
-SRCS=			${BASE_SRCS} sysdep.c softcore.c
-CLEANFILES=		softcore.c testmain testmain.o
+SRCS=		${BASE_SRCS} sysdep.c softcore.c
+CLEANFILES=	softcore.c testmain testmain.o
 .if ${MACHINE_ARCH} == "alpha"
-CFLAGS+=		-mno-fp-regs
+CFLAGS+=	-mno-fp-regs
 .endif
 .if ${MACHINE_ARCH} == "i386"
-CFLAGS+=		-mpreferred-stack-boundary=2
+CFLAGS+=	-mpreferred-stack-boundary=2
 .endif
 .if HAVE_PNP
-CFLAGS+=		-DHAVE_PNP
+CFLAGS+=	-DHAVE_PNP
 .endif
 .ifmake testmain
-CFLAGS+=			-DTESTMAIN -D_TESTMAIN
-SRCS+=				testmain.c
-PROG=			testmain
+CFLAGS+=	-DTESTMAIN -D_TESTMAIN
+SRCS+=		testmain.c
+PROG=		testmain
 .include <bsd.prog.mk>
 .else
-LIB=			ficl
-INTERNALLIB=		yes
-INTERNALSTATICLIB=	yes
-NOPROFILE=		yes
+LIB=		ficl
+INTERNALLIB=	yes
+INTERNALSTATICLIB= yes
+NOPROFILE=	yes
 .include <bsd.lib.mk>
 .endif
 
 # Standard softwords
+.PATH: ${.CURDIR}/softwords
 SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
 		ifbrack.fr
 # Optional OO extension softwords
 #SOFTWORDS+=	oo.fr classes.fr
 
-.PATH:		${.CURDIR}/softwords
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}/../common
 
-softcore.c:	${SOFTWORDS} softcore.awk
+softcore.c: ${SOFTWORDS} softcore.awk
 	(cd ${.CURDIR}/softwords; cat ${SOFTWORDS} \
 	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
-
-