diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index 7e934ccc5984..f1b87ac20fae 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -1,37 +1,36 @@
 # $FreeBSD$
 
 PACKAGE=	ipf
 PROG=		ipf
 SRCS=		${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
 MAN=		ipfilter.4 ipfilter.5 ipf.8 ipf.4 ipf.5 ipl.4
 MLINKS=		ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5
 CFLAGS+=	-I. -DIPFILTER_BPF -DHAS_SYS_MD5_H
 
 GENHDRS=	ipf_l.h ipf_y.h
 CLEANFILES+=	${GENHDRS} ipf_y.c ipf_l.c
 
 ipf_y.c: ipf_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipf_yy/g' \
-	    -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipf_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}
 
 ipf_y.h: ipf_y.c
 
 ipf_l.c: lexer.c
 	sed -e 's/yy/ipf_yy/g' \
 	    -e 's/y.tab.h/ipf_y.h/' \
 	    -e 's/lexer.h/ipf_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipf_l.h: lexer.h
 	sed -e 's/yy/ipf_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .if !defined(RESCUE)
 LIBADD+=	pcap
 .endif
 
 .include <bsd.prog.mk>
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index f774c3197978..671d9eeb8046 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -1,109 +1,106 @@
 #	$FreeBSD$
 
 PACKAGE=	ipf
 PROG=		ipftest
 SRCS=		${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
 		ip_nat6.c \
 		ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
 		ip_pool.c ip_scan.c ip_sync.c ip_rules.c \
 		ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
 		ipf_l.c ipnat_y.c ipnat_l.c md5.c radix_ipf.c ip_dstlist.c
 MAN=		ipftest.1
 
 WARNS?=		0
 CFLAGS+=	-DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \
 		-DIPFILTER_SYNC -DIPFILTER_CKSUM -DHAS_SYS_MD5_H -I.
 
 # XXX	The original tarball does not define IPFILTER_SCAN when building this
 # XXX	and other modules. It is believed the reason is it fails to build.
 # XXX	It has been removed for now.
 # XXX CFLAGS+=		-DIPFILTER_SCAN
 
 
 .PATH:		${SRCTOP}/sys/netpfil/ipfilter/netinet
 
 GENHDRS=	ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
 
 CLEANFILES+=	${GENHDRS}
 CLEANFILES+=	ipf_y.c ipf_l.c
 CLEANFILES+=	ipf.tab.c ipf.tab.h
 CLEANFILES+=	ipnat_y.c ipnat_l.c
 CLEANFILES+=	ipnat.tab.c ipnat.tab.h
 CLEANFILES+=	ippool_y.c ippool_l.c
 CLEANFILES+=	ippool.tab.c ippool.tab.h
 
 ipnat.tab.c ipnat.tab.h: ipnat_y.y
 	${YACC} -b ipnat -d ${.ALLSRC}
 
 ipnat_y.c: ipnat.tab.c
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.c/ipnat_y.c/' \
-	    -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
 	    ipnat.tab.c > ${.TARGET}
 
 ipnat_y.h: ipnat.tab.h
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
 	    ipnat.tab.h > ${.TARGET}
 
 ipnat_y.h: ipnat_y.c
 
 ipnat_l.c: lexer.c
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
 	    -e 's/lexer.h/ipnat_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipnat_l.h: lexer.h
 	sed -e 's/yy/ipnat_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ippool.tab.c ippool.tab.h: ippool_y.y
 	${YACC} -b ippool -d ${.ALLSRC}
 
 ippool_y.c: ippool.tab.c
 	sed -e 's/yy/ippool_yy/g' \
-	    -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
 	    ippool.tab.c > ${.TARGET}
 
 ippool_y.h: ippool.tab.h
 	sed -e 's/yy/ippool_yy/g' \
 	    ippool.tab.h > ${.TARGET}
 
 ippool_y.h: ippool_y.c
 
 ippool_l.c: lexer.c
 	sed -e 's/yy/ippool_yy/g' \
 	    -e 's/y.tab.h/ippool_y.h/' \
 	    -e 's/lexer.h/ippool_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ippool_l.h: lexer.h
 	sed -e 's/yy/ippool_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipf.tab.c ipf.tab.h: ipf_y.y
 	${YACC} -b ipf -d ${.ALLSRC}
 
 ipf_y.c: ipf.tab.c
 	sed -e 's/yy/ipf_yy/g' \
-	    -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
 		ipf.tab.c > ${.TARGET}
 
 ipf_y.h: ipf.tab.h
 	sed -e 's/yy/ipf_yy/g' \
 		ipf.tab.h > ${.TARGET}
 
 ipf_y.h: ipf_y.c
 
 ipf_l.c: lexer.c
 	sed -e 's/yy/ipf_yy/g' \
 	     -e 's/y.tab.h/ipf_y.h/' \
 	     -e 's/lexer.h/ipf_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipf_l.h: lexer.h
 	sed -e 's/yy/ipf_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile
index 8227811db2ad..7225f8c8bcb1 100644
--- a/sbin/ipf/ipmon/Makefile
+++ b/sbin/ipf/ipmon/Makefile
@@ -1,34 +1,33 @@
 #	$FreeBSD$
 
 PACKAGE=	ipf
 PROG=		ipmon
 SRCS=		${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
 MAN=		ipmon.5 ipmon.8
 MLINKS=		ipmon.5 ipmon.conf.5
 
 CFLAGS+=	-DLOGFAC=LOG_LOCAL0 -I.
 
 GENHDRS+=	ipmon_l.h ipmon_y.h
 CLEANFILES+=	${GENHDRS} ipmon_y.c ipmon_l.c
 
 ipmon_y.c: ipmon_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipmon_yy/g' \
-	    -e 's/"ipmon_y.y"/"..\/tools\/ipmon_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipmon_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}
 
 ipmon_y.h: ipmon_y.c
 
 ipmon_l.c: lexer.c
 	sed -e 's/yy/ipmon_yy/g' \
 	    -e 's/y.tab.h/ipmon_y.h/' \
 	    -e 's/lexer.h/ipmon_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipmon_l.h: lexer.h
 	sed -e 's/yy/ipmon_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile
index ba9c50ee70e3..1bdbe61235fb 100644
--- a/sbin/ipf/ipnat/Makefile
+++ b/sbin/ipf/ipnat/Makefile
@@ -1,35 +1,34 @@
 #	$FreeBSD$
 
 PACKAGE=	ipf
 PROG=		ipnat
 SRCS=		${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
 MAN=		ipnat.8 ipnat.4 ipnat.5
 MLINKS=		ipnat.5 ipnat.conf.5
 CFLAGS+=	-I.
 
 GENHDRS=	ipnat_l.h ipnat_y.h
 CLEANFILES+=	${GENHDRS} ipnat_y.c ipnat_l.c
 
 ipnat_y.c: ipnat_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.c/ipnat_y.c/' \
-	    -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
 	    y.tab.h > ${.TARGET:.c=.h}
 
 ipnat_y.h: ipnat_y.c
 
 ipnat_l.c: lexer.c
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
 	    -e 's/lexer.h/ipnat_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipnat_l.h: lexer.h
 	sed -e 's/yy/ipnat_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile
index 674978ed98c2..622952be0477 100644
--- a/sbin/ipf/ippool/Makefile
+++ b/sbin/ipf/ippool/Makefile
@@ -1,32 +1,31 @@
 #	$FreeBSD$
 
 PACKAGE=	ipf
 PROG=		ippool
 SRCS=		${GENHDRS} ippool_y.c ippool_l.c ippool.c
 MAN=		ippool.5 ippool.8
 CFLAGS+=	-I.
 
 GENHDRS=	ippool_l.h ippool_y.h
 CLEANFILES+=	${GENHDRS} ippool_y.c ippool_l.c
 
 ippool_y.c: ippool_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ippool_yy/g' \
-	    -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ippool_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}
 
 ippool_y.h: ippool_y.c
 
 ippool_l.c: lexer.c
 	sed -e 's/yy/ippool_yy/g' \
 	    -e 's/y.tab.h/ippool_y.h/' \
 	    -e 's/lexer.h/ippool_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ippool_l.h: lexer.h
 	sed -e 's/yy/ippool_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>