diff --git a/src/etc/pf.conf b/src/etc/pf.conf
index db7d99f2..011336cb 100644
--- a/src/etc/pf.conf
+++ b/src/etc/pf.conf
@@ -1,35 +1,11 @@
-#	$OpenBSD: pf.conf,v 1.53 2014/01/25 10:28:36 dtucker Exp $
+#	$OpenBSD: pf.conf,v 1.54 2014/08/23 05:49:42 deraadt Exp $
 #
-# See pf.conf(5) for syntax and examples.
-# Remember to set net.inet.ip.forwarding=1 and/or net.inet6.ip6.forwarding=1
-# in /etc/sysctl.conf if packets are to be forwarded between interfaces.
-
-# increase default state limit from 10'000 states on busy systems
-#set limit states 100000
+# See pf.conf(5) and /etc/examples/pf.conf
 
 set skip on lo
 
-# filter rules and anchor for ftp-proxy(8)
-#anchor "ftp-proxy/*"
-#pass in quick inet proto tcp to port ftp divert-to 127.0.0.1 port 8021
-
-# anchor for relayd(8)
-#anchor "relayd/*"
-
 block return	# block stateless traffic
 pass		# establish keep-state
 
-# rules for spamd(8)
-#table <spamd-white> persist
-#table <nospamd> persist file "/etc/mail/nospamd"
-#pass in on egress proto tcp from any to any port smtp \
-#    rdr-to 127.0.0.1 port spamd
-#pass in on egress proto tcp from <nospamd> to any port smtp
-#pass in log on egress proto tcp from <spamd-white> to any port smtp
-#pass out log on egress proto tcp to any port smtp
-
-
-#block in quick from urpf-failed to any	# use with care
-
 # By default, do not permit remote connections to X11
 block return in on ! lo0 proto tcp to port 6000:6010