2 files changed, 11 insertions, 1 deletions

diff --git a/UPDATING b/UPDATING
index 173d73e09c10..5da66d521b41 100644
--- a/UPDATING
+++ b/UPDATING
@@ -22,6 +22,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20080420:
+	The 802.11 wireless support was redone to enable multi-bss
+	operation on devices that are capable.  The underlying device
+	is no longer used directly but instead wlanX devices are
+	cloned with ifconfig.  This requires changes to rc.conf files.
+
+	As part of the multi-bss changes the wlan_scan_ap and wlan_scan_sta
+	modules were merged into the base wlan module.  All references
+	to these modules (e.g. in kernel config files) must be removed.
+
 20080408:
 	psm(4) has gained write(2) support in native operation level.
 	Arbitrary commands can be written to /dev/psm%d and status can
diff --git a/sys/sys/param.h b/sys/sys/param.h
index ffeb7c7f0d30..0f6fed2e72e7 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 800035	/* Master, propagated to newvers */
+#define __FreeBSD_version 800036	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>