diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 4256ad5edb3..13a1e7dc2de 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070703: pf 4.1 import
+OLD_FILES+=usr/libexec/ftp-proxy
 # 20070701: KAME IPSec removal
 OLD_FILES+=usr/include/netinet6/ah.h
 OLD_FILES+=usr/include/netinet6/ah6.h
diff --git a/UPDATING b/UPDATING
index 5403ed9abe3..a46358ad9f8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -21,6 +21,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW:
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070702:
+	The packet filter (pf) code has been updated to OpenBSD 4.1 Please
+	note the changed syntax - keep state is now on by default.  Also
+	note the fact that ftp-proxy(8) has been changed from bottom up and
+	has been moved from libexec to usr/sbin.  Changes in the ALTQ
+	handling also affect users of IPFW's ALTQ capabilities.
+
 20070701:
 	Remove KAME IPsec in favor of FAST_IPSEC, which is now the
 	only IPsec supported by FreeBSD.  The new IPsec stack
diff --git a/sys/sys/param.h b/sys/sys/param.h
index c77057303e2..d77fa036170 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 700048	/* Master, propagated to newvers */
+#define __FreeBSD_version 700049	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>