diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index cc56b20e09d3..4d8c44289157 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -128,7 +128,7 @@ CRUNCH_PROGS_sbin+= vinum
 .endif
 
 .if !defined(NO_IPFILTER)
-CRUNCH_PROGS_sbin+= ipf ipfs ipmon # ipnat
+CRUNCH_PROGS_sbin+= ipf ipfs ipfstat ipmon ipnat
 .endif
 
 # crunchgen does not like C++ programs; this should be fixed someday
diff --git a/sbin/Makefile b/sbin/Makefile
index b87d6df49c24..71e5440598d4 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -87,7 +87,9 @@ SUBDIR+=devd
 .if !defined(NO_IPFILTER)
 SUBDIR+=ipf \
 	ipfs \
-	ipmon
+	ipfstat \
+	ipmon \
+	ipnat
 .endif
 
 .if !defined(NOINET6)
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index a348b1e1de49..9499935c2c39 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -143,7 +143,8 @@ SUBDIR+=mld6query \
 .endif
 
 .if !defined(NO_IPFILTER)
-SUBDIR+=ipresend \
+SUBDIR+=ipftest \
+	ipresend \
 	ipsend \
 	iptest
 .endif