diff --git a/UPDATING b/UPDATING
index 113aebce7b1d..592c9ee64c09 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.
 
+20060412:
+	The ip6fw utility has been removed.  The behavior provided by
+	ip6fw has been in ipfw2 for a good while and the rc.d scripts
+	have been update to deal with it.  There are some rules that
+	might not migrate cleanly.  Use rc.firewall6 as a template to
+	rewrite rules.
+
 20060428:
 	The puc(4) driver has been overhauled. The ebus(4) and sbus(4)
 	attachments have been removed. Make sure to configure scc(4)
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 307823b8592f..ed8a0ab025e8 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 700016	/* Master, propagated to newvers */
+#define __FreeBSD_version 700017	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>