Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -107,10 +107,6 @@
 SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
 .endif
 
-.if ${MK_PORTSNAP} != "no"
-BIN1+= portsnap.conf
-.endif
-
 .if ${MK_PF} != "no"
 BIN1+= pf.os
 .endif
Index: head/etc/portsnap.conf
===================================================================
--- head/etc/portsnap.conf
+++ head/etc/portsnap.conf
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-# Default directory where compressed snapshots are stored.
-# WORKDIR=/var/db/portsnap
-
-# Default location of the ports tree (target for "update" and "extract").
-# PORTSDIR=/usr/ports
-
-# Server or server pool from which to fetch updates.  You can change
-# this to point at a specific server if you want, but in most cases
-# using a "nearby" server won't provide a measurable improvement in
-# performance.
-SERVERNAME=portsnap.FreeBSD.org
-
-# Trusted keyprint.  Changing this is a Bad Idea unless you've received
-# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
-# change it and explaining why.
-KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3aede40c98633216c330
-
-# Example of ignoring parts of the ports tree.  If you know that you
-# absolutely will not need certain parts of the tree, this will save
-# some bandwidth and disk space.  See the manual page for more details.
-#
-# WARNING: Working with an incomplete ports tree is not supported and
-# can cause problems due to missing dependencies.  If you have REFUSE
-# directives and experience problems, remove them and update your tree
-# before asking for help on the mailing lists.
-#
-# REFUSE arabic chinese french german hebrew hungarian japanese
-# REFUSE korean polish portuguese russian ukrainian vietnamese
-
-# List of INDEX files to build and the DESCRIBE file to use for each
-#INDEX INDEX-10 DESCRIBE.10
-#INDEX INDEX-11 DESCRIBE.11
-INDEX INDEX-12 DESCRIBE.12
Index: head/usr.sbin/portsnap/portsnap/Makefile
===================================================================
--- head/usr.sbin/portsnap/portsnap/Makefile
+++ head/usr.sbin/portsnap/portsnap/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	portsnap.conf
 SCRIPTS=portsnap.sh
 MAN=	portsnap.8
 
Index: head/usr.sbin/portsnap/portsnap/portsnap.conf
===================================================================
--- head/usr.sbin/portsnap/portsnap/portsnap.conf
+++ head/usr.sbin/portsnap/portsnap/portsnap.conf
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+# Default directory where compressed snapshots are stored.
+# WORKDIR=/var/db/portsnap
+
+# Default location of the ports tree (target for "update" and "extract").
+# PORTSDIR=/usr/ports
+
+# Server or server pool from which to fetch updates.  You can change
+# this to point at a specific server if you want, but in most cases
+# using a "nearby" server won't provide a measurable improvement in
+# performance.
+SERVERNAME=portsnap.FreeBSD.org
+
+# Trusted keyprint.  Changing this is a Bad Idea unless you've received
+# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
+# change it and explaining why.
+KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3aede40c98633216c330
+
+# Example of ignoring parts of the ports tree.  If you know that you
+# absolutely will not need certain parts of the tree, this will save
+# some bandwidth and disk space.  See the manual page for more details.
+#
+# WARNING: Working with an incomplete ports tree is not supported and
+# can cause problems due to missing dependencies.  If you have REFUSE
+# directives and experience problems, remove them and update your tree
+# before asking for help on the mailing lists.
+#
+# REFUSE arabic chinese french german hebrew hungarian japanese
+# REFUSE korean polish portuguese russian ukrainian vietnamese
+
+# List of INDEX files to build and the DESCRIBE file to use for each
+#INDEX INDEX-10 DESCRIBE.10
+#INDEX INDEX-11 DESCRIBE.11
+INDEX INDEX-12 DESCRIBE.12