diff --git a/libexec/Makefile b/libexec/Makefile
index f827edbd9d89..2c8c1d4653b8 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.48 2004/06/25 16:34:45 itojun Exp $
+#	$NetBSD: Makefile,v 1.49 2004/11/11 11:54:51 yamt Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 .include <bsd.own.mk>
@@ -13,7 +13,4 @@ SUBDIR=	atrun comsat fingerd ftpd getNAME getty identd ld.aout_so \
 SUBDIR+= hpropd kadmind kpasswdd
 .endif
 
-# PF
-SUBDIR+=spamd spamd-setup ftp-proxy spamlogd
-
 .include <bsd.subdir.mk>
diff --git a/sbin/Makefile b/sbin/Makefile
index 5d3a35a26363..b672b5a5c2cc 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.89 2004/11/11 01:55:27 christos Exp $
+#	$NetBSD: Makefile,v 1.90 2004/11/11 11:54:51 yamt Exp $
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
 
 # Not ported: XNSrouted enpload scsiformat startslip
@@ -50,7 +50,4 @@ SUBDIR+= ping6 rtsol
 # IPsec
 SUBDIR+= setkey
 
-# PF
-SUBDIR+= pfctl
-
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index c1ea164019c7..823172cd47d1 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.194 2004/08/23 13:27:38 lukem Exp $
+#	$NetBSD: Makefile,v 1.195 2004/11/11 11:54:51 yamt Exp $
 #	from: @(#)Makefile	5.20 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -16,7 +16,7 @@ SUBDIR=	ac accton altq amd apm apmd arp bad144 bind bootp catman \
 	pstat pwd_mkdb powerd quot quotacheck quotaon rarpd rbootd rdate \
 	repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
 	rpc.statd rpcbind rwhod sa screenblank sesd \
-	sliplogin slstats spamdb sntp \
+	sliplogin slstats sntp \
 	spray sunlabel sup sushi syslogd tadpolectl tcpdchk \
 	tcpdmatch tcpdump timed tpctl traceroute trpt trsp unlink \
 	usbdevs user videomode vipw vnconfig wiconfig wlanctl wsconscfg \
@@ -48,6 +48,6 @@ SUBDIR+= racoon
 .endif
 
 # PF
-SUBDIR+=authpf
+SUBDIR+=pf
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/pf/Makefile b/usr.sbin/pf/Makefile
new file mode 100644
index 000000000000..986cb9df664b
--- /dev/null
+++ b/usr.sbin/pf/Makefile
@@ -0,0 +1,12 @@
+#	$NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
+
+SUBDIR=		authpf
+SUBDIR+=	ftp-proxy
+SUBDIR+=	pfctl
+# notyet SUBDIR+=	pflogd
+SUBDIR+=	spamd
+SUBDIR+=	spamd-setup
+SUBDIR+=	spamdb
+SUBDIR+=	spamlogd
+
+.include <bsd.subdir.mk>
diff --git a/usr.sbin/pf/Makefile.inc b/usr.sbin/pf/Makefile.inc
new file mode 100644
index 000000000000..74aaa6fd94ff
--- /dev/null
+++ b/usr.sbin/pf/Makefile.inc
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile.inc,v 1.1 2004/11/11 11:54:51 yamt Exp $
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include "${.CURDIR}/../../Makefile.inc"
+.endif
diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/pf/authpf/Makefile
similarity index 88%
rename from usr.sbin/authpf/Makefile
rename to usr.sbin/pf/authpf/Makefile
index 0afd175125ae..1371698f4d37 100644
--- a/usr.sbin/authpf/Makefile
+++ b/usr.sbin/pf/authpf/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2004/06/25 00:06:09 itojun Exp $
+#	$NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
 #	$OpenBSD: Makefile,v 1.10 2003/11/20 23:23:09 avsm Exp $
 
 PROG=	authpf
diff --git a/libexec/ftp-proxy/Makefile b/usr.sbin/pf/ftp-proxy/Makefile
similarity index 83%
rename from libexec/ftp-proxy/Makefile
rename to usr.sbin/pf/ftp-proxy/Makefile
index 442e015ed2cd..f307ca32a2f1 100644
--- a/libexec/ftp-proxy/Makefile
+++ b/usr.sbin/pf/ftp-proxy/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2004/11/11 10:30:13 yamt Exp $
+#	$NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
 #	$OpenBSD: Makefile,v 1.4 2003/11/20 23:23:09 avsm Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 
@@ -18,6 +18,8 @@ CPPFLAGS+=-DLIBWRAP
 LDADD+=	-lwrap
 DPADD+=	${LIBWRAP}
 
+BINDIR=	/usr/libexec
+
 .include <bsd.prog.mk>
 
 .PATH: ${NETBSDSRCDIR}/dist/pf/libexec/ftp-proxy
diff --git a/sbin/pfctl/Makefile b/usr.sbin/pf/pfctl/Makefile
similarity index 67%
rename from sbin/pfctl/Makefile
rename to usr.sbin/pf/pfctl/Makefile
index 56fac70d4493..f6906cd0955b 100644
--- a/sbin/pfctl/Makefile
+++ b/usr.sbin/pf/pfctl/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.1 2004/06/22 15:16:30 itojun Exp $
+#	$NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
 #	$OpenBSD: Makefile,v 1.15 2004/03/10 18:49:49 mcbride Exp $
 
+.include <bsd.own.mk>		# for MKDYNAMICROOT definition
+
 PROG=	pfctl
 SRCS=	pfctl.c parse.y pfctl_parser.c pf_print_state.c pfctl_altq.c
 SRCS+=	pfctl_osfp.c pfctl_radix.c pfctl_table.c pfctl_qstats.c
@@ -13,6 +15,11 @@ WARNS?=	1
 LDADD+=	-lm
 DPADD+=	${LIBM}
 
+BINDIR=		/sbin
+.if (${MKDYNAMICROOT} == "no")
+LDSTATIC?=	-static
+.endif
+
 .include <bsd.prog.mk>
 
 .PATH: ${NETBSDSRCDIR}/dist/pf/sbin/pfctl
diff --git a/libexec/spamd-setup/Makefile b/usr.sbin/pf/spamd-setup/Makefile
similarity index 73%
rename from libexec/spamd-setup/Makefile
rename to usr.sbin/pf/spamd-setup/Makefile
index cd3c2100c407..975073dc4b64 100644
--- a/libexec/spamd-setup/Makefile
+++ b/usr.sbin/pf/spamd-setup/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2004/06/22 15:53:18 itojun Exp $
+#	$NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
 #	$OpenBSD: Makefile,v 1.3 2004/01/21 08:07:41 deraadt Exp $
 
 PROG=	spamd-setup
@@ -8,6 +8,8 @@ MAN=	spamd-setup.8
 LDADD=	-lz
 DPADD=	${LIBZ}
 
+BINDIR=	/usr/libexec
+
 .include <bsd.prog.mk>
 
 .PATH: ${NETBSDSRCDIR}/dist/pf/libexec/spamd-setup
diff --git a/libexec/spamd/Makefile b/usr.sbin/pf/spamd/Makefile
similarity index 81%
rename from libexec/spamd/Makefile
rename to usr.sbin/pf/spamd/Makefile
index 5b2557167788..61cc2009c041 100644
--- a/libexec/spamd/Makefile
+++ b/usr.sbin/pf/spamd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2004/11/11 11:27:34 yamt Exp $
+#	$NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
 #	$OpenBSD: Makefile,v 1.7 2004/02/26 07:28:55 beck Exp $
 
 PROG=	spamd
@@ -11,6 +11,8 @@ WARNS?=	1
 CPPFLAGS+=	-D'openlog_r(ident, logopt, fac, data)=/*nothing*/'
 CPPFLAGS+=	-D'syslog_r(pri, data, ...)=syslog((pri), __VA_ARGS__)'
 
+BINDIR=	/usr/libexec
+
 .include <bsd.prog.mk>
 
 .PATH: ${NETBSDSRCDIR}/dist/pf/libexec/spamd
diff --git a/usr.sbin/spamdb/Makefile b/usr.sbin/pf/spamdb/Makefile
similarity index 79%
rename from usr.sbin/spamdb/Makefile
rename to usr.sbin/pf/spamdb/Makefile
index e6e076b13e0a..aedef0d11df0 100644
--- a/usr.sbin/spamdb/Makefile
+++ b/usr.sbin/pf/spamdb/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2004/06/25 16:25:00 itojun Exp $
+#	$NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
 #	$OpenBSD: Makefile,v 1.2 2004/02/27 19:41:39 david Exp $
 
 PROG=	spamdb
diff --git a/libexec/spamlogd/Makefile b/usr.sbin/pf/spamlogd/Makefile
similarity index 83%
rename from libexec/spamlogd/Makefile
rename to usr.sbin/pf/spamlogd/Makefile
index 3472f8672cba..03abf52f831d 100644
--- a/libexec/spamlogd/Makefile
+++ b/usr.sbin/pf/spamlogd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2004/11/11 11:27:34 yamt Exp $
+#	$NetBSD: Makefile,v 1.1 2004/11/11 11:54:51 yamt Exp $
 #	$OpenBSD: Makefile,v 1.2 2004/02/27 19:41:39 david Exp $
 
 PROG=	spamlogd
@@ -11,6 +11,8 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/dist/pf/libexec/spamd
 CPPFLAGS+=	-D'openlog_r(ident, logopt, fac, data)=/*nothing*/'
 CPPFLAGS+=	-D'syslog_r(pri, data, ...)=syslog((pri), __VA_ARGS__)'
 
+BINDIR=	/usr/libexec
+
 .include <bsd.prog.mk>
 
 .PATH: ${NETBSDSRCDIR}/dist/pf/libexec/spamlogd