diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 80383d8eeb1..53467f85dbc 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -2,19 +2,16 @@
               =============================
 
 Changes in alpha19
+ - Virtual registry framework with printing hooks (jerry)
  - Heavy registry updates (jerry)
  - Use 850 as the default DOS character set in smb.conf (tpot)
  - printer fixes - removed encoding of queueid in job number (jra)
  - A lot of small fixes (jra)
- - virtual registry framework with initial printing hooks (jerry)
  - Don't crash on setfileinfo on printer fsp(jra)
  - fixed line buffer mode in XFILE(jra)
  - update samba.schema from 2.2 (jerry,idra)
  - Fix problem with oplock breaks and win2k - 
    noticed by Lev Iserovich <lev@ciprico.com> (jra)
- - Give different error message when PDC is down - 
-   thanks to Mark Kaplan from Quantum (abartlet)
- - Add wrapper for dup2() (abartlet)
  - Update smbgroupedit to document -d - thanks to metze (abartlet)
  - Support weird behaviour used by win9x pass-through auth (abartlet,tpot)
  - Support for duplicating stderr in log files (abartlet)
@@ -27,15 +24,11 @@ Changes in alpha19
  - Ensure to be root when opening printer backend tdb (jra)
  - Merges from APPLIANCE_HEAD (tpot,jerry)
  - configure updates (tridge)
- - particularly getgrouplist() (tridge)
- - Make sure to be root when accessing pdb (abartlet)
- - Better PAM error message (abartlet)
+ - getgrouplist() updates (tridge)
  - Support for pdbedit to query account policy values (abartlet)
- - Fix few typos (mimir, abartlet)
  - Allow one to create trusting domain account using smbpasswd (mimir,abartlet)
  - 'Net rpc trustdom list' (mimir, abartlet)
  - Fix fallback to anonymous connection (mimir, abartlet)
- - Add debugging info to secrets.c (mimir, abartlet)
  - Fix for pdb_ldap and OpenLDAP 2.1
  - Added support in swat to determine whether winbind is running (idra)
  - Add 'hide unwritable' option (idra)
@@ -52,52 +45,40 @@ Changes in alpha19
  - Better quote handling in smb.conf (abartlet)
  - Support browsers setting multiple languages in swat (idra)
  - Changed str_list_make to be able to use a different separator string (idra)
- - Remove use of strtof because of portability issues (idra)
- - Common popt definition for -d option (tpot)
  - Samsync support to insert account info into the pdb (tpot)
  - Don't hide unwritable dirs when 'hide unwritable' is enabled - 
    suggested by Alexander Oswald <oswald@is.haw-hamburg.de> (idra)
  - Fix for handling sparse files in smbd (tridge)
  - Merges from 2_2 (jerry)
- - Add cvslog.pl file
  - Minor printer fixes (jerry)
- - Fix SID lookup code to never do recursive winbind (abartlet)
- - Fix SID lookup code to never use algoritmic rid for fixed mappings (abartlet)
+ - Add some checks to SID lookup code (abartlet)
  - Cascaded VFS (Alexander Bokovoy, idra)
- - Optimisations when in ADS mode (tridge)
- - Try netbios-less connections when in ADS mode (tridge)
- - Minor ADS tweaks (tridge)
+ - Some netbios-less connections support in ADS mode (tridge)
+ - ADS tweaks (tridge)
  - Fix plaintext passwords with win2k (tridge)
  - 'net ads info' reports IP of LDAP server (tridge)
- - Add LSA RPC 0x2E, lsa_query_info2 (jmcd)
+ - Add some more RPC functions (jmcd)
  - Add 'smb ports = ' option (tridge)
  - Various small fixes (tridge)
- - Add 'disable netbios = yes/no' (tridge)
  - Passdb security checks (abartlet)
  - Large winbind updates (abartlet)
  - Moved rpc client routines from libsmb to rpc_client (tpot)
  - Few nmbd fixes (jmcd)
- - Fix swat to handle new debug level (idra)
- - Fix name length in namequeries (tridge)
- - Netbios-less setup ADS fixes (tridge)
- - Add SAMR 0x3e, which is samr_connect4 (jmcd)
- - Add consts to passdb (abartlet)
- - Don't client binaries depend on libs they don't use - 
+ - Fix swat to handle new debug level code (idra)
+ - Fix name length bug in namequeries (tridge)
+ - Don't have client binaries depend on libs they don't use - 
    patch from Steve Langasek <vorlon@netexpress.net> (abartlet)
  - Printing change notification (merged from HEAD_APPLIANCE) (jerry)
  - fix delete printer driver (from HEAD_APPLIANCE) (jerry)
  - Added pdb_xml and pdb_mysql (jelmer)
  - Update pdb_test (jelmer)
  - Fix security issues with %m (abartlet)
- - Add client side support for samr connect4 (0x3e) (jmcd)
- - Add lsa 0x2e (queryinfo2) client side (jmcd)
  - Support for service joins from win2k AND use SPNEGO (jmcd)
  - pdbedit -i and -e fix, add -b (idra)
  - textdocs converted to sgml (jelmer, jerry)
  - Merge netbios namecache code from APPLIANCE_HEAD (tpot)
  - Fix segs in new NTLMSSP code (abartlet)
  - Always make guest rid 501 (abartlet)
- 
 
 Changes in alpha18
  - huge number of changes! really too many to list ... (and its 1am