diff --git a/ChangeLog.pre-2.1 b/ChangeLog.pre-2.1
index 0edc4dbe..27d867d7 100644
--- a/ChangeLog.pre-2.1
+++ b/ChangeLog.pre-2.1
@@ -4691,8 +4691,6 @@ GNU nano 1.3.0 - 2003.10.22
 - AUTHORS:
 	- Updated to show 1.2/1.3 maintainers.
 
-- 1.3 tree forks here
-
 GNU nano 1.2.2 - 2003.08.11
 - General:
 	- Translation updates (see po/ChangeLog for details).
@@ -5333,7 +5331,7 @@ GNU nano 1.1.99pre1 - 2003.01.17
 - THANKS:
 	- Added Doruk Fisek and Peio Ziarsolo (Jordi).
 
-GNU nano 1.1.12 - 10/24/2002
+GNU nano 1.1.12 - 2002.10.24
 - General:
 	- Translation updates (see po/ChangeLog for details).
 	- Remove malloc.h, as it's unneeded and just causes annoyances on
@@ -5385,7 +5383,7 @@ GNU nano 1.1.12 - 10/24/2002
 	- Fix a potential infinite loop occurring with certain
 	  zero-length regexes. (David Benbennick)
 
-GNU nano 1.1.11 - 10/01/2002
+GNU nano 1.1.11 - 2002.10.01
 - General:
 	- Translation updates (see po/ChangeLog for details).
 	- Upgraded to gettext 0.11.5 (Jordi).
@@ -5532,7 +5530,7 @@ GNU nano 1.1.11 - 10/01/2002
 	  ability (at the search prompt, ^W goes to the paragraph's
 	  beginning, and ^O goes to the paragraph's end). (DLR)
 
-GNU nano 1.1.10 - 07/25/2002
+GNU nano 1.1.10 - 2002.07.25
 - General:
 	- Translation updates (see po/ChangeLog for details).
 	- Upgraded to gettext 0.11.2 (Jordi).
@@ -5852,7 +5850,7 @@ GNU nano 1.1.10 - 07/25/2002
 	- Fixed David Benbennick's email address. (David Benbennick)
 	- Typo fix. (DLR)
 
-GNU nano 1.1.9 - 05/12/2002
+GNU nano 1.1.9 - 2002.05.12
 - General:
 	- Typos n misspellings all over the place (David Benbennick).
 	- Allow --tiny and --multibuffer to cooperate (who the heck
@@ -5956,7 +5954,7 @@ GNU nano 1.1.9 - 05/12/2002
 - po/sv.po:
 	- Swedish translation updates (Christian Rose).
 
-GNU nano 1.1.8 - 03/30/2002
+GNU nano 1.1.8 - 2002.03.30
 - General
 	- Type misalignments and mem leaks in renumber_all, do_justify
 	  and do_spell (Rocco & Steven Kneizys).
@@ -6053,7 +6051,7 @@ GNU nano 1.1.8 - 03/30/2002
 - po/da.po:
 	- Danish translation updates (Keld Simonsen).
 	
-GNU nano 1.1.7 - 03/05/2002
+GNU nano 1.1.7 - 2002.03.05
 - General
 	- malloc->calloc, etc cleanups (DLR).
 	- New option, noconvert (-N, --noconvert) to completely stop
@@ -6174,7 +6172,7 @@ GNU nano 1.1.7 - 03/05/2002
 - po/pl.po:
 	- Polish translation updates (Wojciech Kotwica).
 
-nano-1.1.6 - 01/25/2002
+nano-1.1.6 - 2002.01.25
 - General
 	- Add Meta-A as alternate keystroke for ^^ for people with
 	  non-US keyboards.
@@ -6275,7 +6273,7 @@ nano-1.1.6 - 01/25/2002
 - po/da.po:
 	- Danish translation update (Keld Simonsen).
 
-nano-1.1.5 - 01/05/2002
+nano-1.1.5 - 2002.01.05
 - General
 	- Better integration of View mode (-v) and multibuffer.
 	  Fixes to new_file(), do_insertfile_void(), shortcut_init()
@@ -6350,7 +6348,7 @@ nano-1.1.5 - 01/05/2002
 - po/fr.po:
 	- French translation update (Jean-Philippe Guérard).
 
-nano-1.1.4 - 12/11/2001
+nano-1.1.4 - 2001.12.11
 - General
 	- Preliminary syntax highlighting support.  New functions
 	  colortoint() and parse_color() in rcfile.c, new code in
@@ -6400,7 +6398,7 @@ nano-1.1.4 - 12/11/2001
 - m4/gettext.m4:
 	- diff against mutt 1.2.5's gettext.m4.
 
-nano-1.1.3 - 10/26/2001
+nano-1.1.3 - 2001.10.26
 - General
 	- Finally wrote function-specific help mode.  Changes to
 	  nano.c:help_init() and winio.c:do_help().  Changed
@@ -6456,7 +6454,7 @@ nano-1.1.3 - 10/26/2001
 - po/ru.po, po/uk.po:
 	- Updated Russian and Ukrainian translation (Sergey A. Ribalchenko).
 
-nano-1.1.2 - 10/03/2001
+nano-1.1.2 - 2001.10.03
 - General
 	- Added BUGS #63 & 64.  Fixes in search_init() and nanogetstr(),
 	  new flag CLEAR_BACKUPSTRING because there's no easy way to
@@ -6563,7 +6561,7 @@ nano-1.1.2 - 10/03/2001
 - po/fi.po:
 	- Updated Finnish translation (Pauli Virtanen).
 
-nano-1.1.1 - 07/28/2001
+nano-1.1.1 - 2001.07.28
 - General
 	- Reverted included gettext from 0.10.38 to 0.10.35 in intl/ dir.
 	- Added m4/ directory to allow rebuilding using only the internal
@@ -6604,7 +6602,7 @@ nano-1.1.1 - 07/28/2001
 	- Fixed an off by one that wasn't letting lines with odd #
 	  shortcuts work in certain cases.
 
-nano-1.1.0 - 07/15/2001
+nano-1.1.0 - 2001.07.15
 - General
 	- New global variables currshortcut and currslen to support using
 	  the mouse with the shortcuts.  Also supports clicking on files
@@ -6786,9 +6784,7 @@ nano-1.1.0 - 07/15/2001
 - po/sv.po:
 	- New Swedish translation by Christian Rose <menthos@menthos.com>.
 
-nano 1.1 tree forked here 04/07/2001
-
-nano 1.0.1 - 04/06/2001
+nano 1.0.1 - 2001.04.06
 - General:
 	- added configure option --disable-wrapping.  Does what it says,
 	  no wrapping or checks are done.  Separate from --enable-tiny,
@@ -6822,7 +6818,7 @@ nano 1.0.1 - 04/06/2001
   	- added intl/libintl.h to the rm -f rule, should fix the unresolved
 	  gettext symbols problem (Jordi).
 
-nano-1.0.0 - 03/22/2001
+nano-1.0.0 - 2001.03.22
 - General
 	- Added void to functions declared as () args, nano.c:do_mark()
 	  and search.c:regexp_cleanup(). (Christian Weisgerber).
@@ -6840,7 +6836,7 @@ nano-1.0.0 - 03/22/2001
   statusq()
 	- Added NANO_BACK_KEY and NANO_FORWARD_KEY cases for left and right.
 
-1.0-test prerelease - 03/17/2001
+1.0-test prerelease - 2001.03.17
 - nano.c:
   do_wrap()
 	- Added case for autoindenting text causing new line (Adam).
@@ -6859,7 +6855,7 @@ nano-1.0.0 - 03/22/2001
 - nano.texi:
 	- Meta-Z correction and grammar in --enable-tiny desc (Neil Parks).
 
-nano-0.9.99pre3 - 02/19/2001
+nano-0.9.99pre3 - 2001.02.19
 - General
   GNU compliance issues:
 	- Reworked shortcut list, put "Get Help" into default list,
@@ -6903,7 +6899,7 @@ nano-0.9.99pre3 - 02/19/2001
 	- Miquel Vidal <miquel@sindominio.net> went over it and corrected
 	  many typos and completed bits that remained untranslated by error.
 
-nano-0.9.99pre2 - 01/31/2001
+nano-0.9.99pre2 - 2001.01.31
 General
 	- Removed center_x and center_y globals.  center_y was
 	  completely unused and center_x was only used a few places,
@@ -6942,7 +6938,7 @@ General
   nanogetstr()
 	- Sanity check for x overrunning the string buffer len.
 
-nano 0.9.99pre1 - 01/17/2001
+nano 0.9.99pre1 - 2001.01.17
 General
 	- Changed #ifdefs to check for both DISABLE_TABCOMP and
 	  NANO_SMALL, makes tiny option leave out tab completion, which
@@ -7007,7 +7003,7 @@ General
 - fi.po:
 	- Update by Pauli Virtanen.
 
-nano 0.9.25 - 01/07/2001
+nano 0.9.25 - 2001.01.07
 General -
 	- New file browser code.  New functions in files.c:do_browser(),
 	  helper functions browser_init(), tail(), striponedir(),
@@ -7066,7 +7062,7 @@ General -
 - es.po:
 	- Updates for file browser (Jordi).
 
-nano 0.9.24 - 12/18/2000
+nano 0.9.24 - 2000.12.18
 General
 	- Added --disable-help option, affects acconfig.h, configure(.in),
 	  winio.c:do_help, nano.c:help_init,help_text_init,version.
@@ -7122,7 +7118,7 @@ General
 	- Increment totsize!!  We decrement it when we've read a file,
 	  everywhere else it should automatically be incremented
 
-nano 0.9.23 - 12/08/2000
+nano 0.9.23 - 2000.12.08
 General
 	- Changed --disable-spell to --disable speller.  The term is
 	  "speller" for -s, so it should be --disable-speller.
@@ -7148,7 +7144,7 @@ General
   update_line()
 	- More '$' display fixes (Rocco Corsi).
 
-nano 0.9.22 - 12/02/2000
+nano 0.9.22 - 2000.12.02
 - General
 	- Username tab completion code, and cleaned up existing tabcomp
 	  code. New functions real_dir_from_tide(), append_slash_if_dir(),
@@ -7227,7 +7223,7 @@ nano 0.9.22 - 12/02/2000
 - es.po:
 	- Traditional Spanish strings updates.
 
-nano 0.9.21 - 11/23/2000
+nano 0.9.21 - 2000.11.23
 - AUTHORS
 	- Added Rocco Corsi.
 - nano.c:
@@ -7250,7 +7246,7 @@ nano 0.9.21 - 11/23/2000
 - nano.1, nano.1.html
 	- Updated man page for new -p definition.
 
-nano 0.9.20 - 11/18/2000
+nano 0.9.20 - 2000.11.18
 - General
 	- Ran source through indent -kr again.  Make everything pretty.
 	- Changed behavior of "search" and "replace" prompts to make all
@@ -7338,7 +7334,7 @@ nano 0.9.20 - 11/18/2000
 - es.po:
 	- Updated translation for 0.9.20 (Jordi).
 
-nano 0.9.19 - 10/02/2000
+nano 0.9.19 - 2000.10.02
 - General
 	- Added PDCurses support under cygwin, which allows building
 	  a nice stand-alone nano.exe for those poor Windows users.
@@ -7353,7 +7349,7 @@ nano 0.9.19 - 10/02/2000
 - search.c
 	- Added initializations for last_search and last_replace (Rocco Corsi)
 
-nano 0.9.18 - 09/18/2000
+nano 0.9.18 - 2000.09.18
 - General
 	- Changed _POSIX_VERSION checks in regex code to HAVE_REGEX_H,
 	  added check for regex.h in configure.in.
@@ -7401,7 +7397,7 @@ nano 0.9.18 - 09/18/2000
 - de.po
 	- Revised translations by floki@bigfoot.com
 
-nano-0.9.17 - 09/04/2000
+nano-0.9.17 - 2000.09.04
 - General
 	- New shortcuts to toggle certain options that are normally only
 	  flags via Alt/Meta.  See Alt-C,E,I,K,M,P,X,Z.  New struct called
@@ -7456,7 +7452,7 @@ nano-0.9.17 - 09/04/2000
 	- Fixed check for string that only occurs on the same line failing
 	  (discovered by Ken Tyler).
 
-nano-0.9.16 - 08/09/2000
+nano-0.9.16 - 2000.08.09
 - cut.c:
   do_cut_text()
 	- Fixed getting locked into cutbuffer on cutting first line of file.
@@ -7474,7 +7470,7 @@ nano-0.9.16 - 08/09/2000
 - configure.in:
 	- New (and severally revised =) slang test code (Albert Chin-A-Young)
 
-nano-0.9.15 - 08/03/2000
+nano-0.9.15 - 2000.08.03
 - Changed edit_update call to take arguments TOP, CENTER or BOTTOM.
   Affects many many functions.  Removed functions edit_update_top and
   edit_update_bot.
@@ -7518,7 +7514,7 @@ nano-0.9.15 - 08/03/2000
 	- Made function more like Pico's version, only move down to two
 	  lines after edittop.
 
-nano-0.9.14 - 07/27/2000
+nano-0.9.14 - 2000.07.27
 - nano.h:
 	- Set CUT_TO_END to a different bit than TEMP_OPT.  Fixes bug #32.
 - cut.c:
@@ -7541,7 +7537,7 @@ nano-0.9.14 - 07/27/2000
 - de.po
 	- Revised translations by floki@bigfoot.com
 
-nano-0.9.13 - 07/23/2000
+nano-0.9.13 - 2000.07.23
 - Implemented Pico's -k mode.  New flag CUT_TO_END, option (-k, --cut),
   affects do_cut_text in cut.c.  Not available with SMALL_NANO because it
   depends on the marker code which is not available with that setting.
@@ -7588,7 +7584,7 @@ nano-0.9.13 - 07/23/2000
 - es.po:
 	- Updated strings to 0.9.13 (Jordi).
 
-nano-0.9.12 - 07/07/2000
+nano-0.9.12 - 2000.07.07
 - all:
 	- New regexp search feature by Bill Soudan.  New flags USE_REGEXP
 	  and REGEXP_COMPILED, new functions regexp_init, regexp_cleanup
@@ -7647,7 +7643,7 @@ nano-0.9.12 - 07/07/2000
   edit_add:
 	- removal of redundant call to mvwaddnstr
 
-nano-0.9.11 - 06/20/2000
+nano-0.9.11 - 2000.06.20
 - New flag "-T" or "--tabsize" to specify how to display tab widths.
   Affects main() in nano.c, strlenpt(), xpt() and actual_x() (et al) in
   winio.c, and nano.h.  Many hardcoded "8"s have been changed to the
@@ -7694,7 +7690,7 @@ nano-0.9.11 - 06/20/2000
 	- Contains all our searching and related functions, (do_search(),
 	  findnextstr(), do_replace(), do_gotoline()).
 
-nano-0.9.10 - 06/04/2000
+nano-0.9.10 - 2000.06.04
 - es.po:
 	- Translation updates (Jordi).
 - AUTHORS, nano.1.html, TODO, README:
@@ -7705,7 +7701,7 @@ nano-0.9.10 - 06/04/2000
 	  to stop people losing their SIGINT character when using args that
 	  exit nano before it runs (--version, --help, etc).
 
-nano-0.9.9 - 05/31/2000
+nano-0.9.9 - 2000.05.31
 - Makefile.am:
 	- Added proper lines for defining LOCALEDIR.
 - configure.in:
@@ -7752,7 +7748,7 @@ nano-0.9.9 - 05/31/2000
   total_refresh():
 	- Completely rewrote function, not quite so brain-damaged now.
 
-nano-0.9.8 - 05/18/2000
+nano-0.9.8 - 2000.05.18
 - nano.c:
   main():
 	- Added awesome code that disables the CINTR and CQUIT
@@ -7776,7 +7772,7 @@ nano-0.9.8 - 05/18/2000
 	- Removed suspend sc_init call and suspend message because suspend
 	  is no longer needed in the shortcut list to work properly.
 
-nano-0.9.7 - 05/14/2000
+nano-0.9.7 - 2000.05.14
 - nano.c:
   do_home(), do_end():
 	- Added calls to update_line for the current line, fixes
@@ -7790,7 +7786,7 @@ nano-0.9.7 - 05/14/2000
 	- Added edit_update_top to cut when mark is set, fixes lack of
 	  display update (bug discovered by Ken Tyler).
 
-nano-0.9.6 - 05/08/2000
+nano-0.9.6 - 2000.05.08
 - New Italian translation (it.po), by Daniele Medri.
 - nano.c:
   page_up(), page_down():
@@ -7811,7 +7807,7 @@ nano-0.9.6 - 05/08/2000
 	  computes edittop and editbot and calls edit_refresh() to do the
 	  rest, which removes a lot of duplicate code...
 
-nano-0.9.5 - 05/01/2000
+nano-0.9.5 - 2000.05.01
 - Removed bytes from file struct because it was computationally wasteful.
 - cut.c:
   do_uncut_text():
@@ -7849,7 +7845,7 @@ nano-0.9.5 - 05/01/2000
 - Makefile.am:
 	- Addition of -Iintl for gettext (Albert Chin-A-Young)
 
-nano-0.9.4 - 04/25/2000
+nano-0.9.4 - 2000.04.25
  - Fixed calls to no_help and changed them to the more consistent
    ISSET(NO_HELP).  Fixed return val of no_help to be what it should (2,
    not 1.  Code to temporarily disable NO_HELP when in the
@@ -7883,7 +7879,7 @@ nano-0.9.4 - 04/25/2000
 	  cut code when cutting more than one line, and cutbuffer gets
 	  blown away when it shouldn't.
 
-nano-0.9.3 - 04/29/2000
+nano-0.9.3 - 2000.04.29
 - cut.c:
   do_marked_cut():
 	- Fixed off by one error in cut code for marked text.
@@ -7931,12 +7927,12 @@ nano-0.9.3 - 04/29/2000
 	  ncurses, requires slcurses.h for wrapper functions. (Based
 	  on patches for 0.8.7 by Glenn McGrath).
 
-nano-0.9.2 - 04/15/2000
+nano-0.9.2 - 2000.04.15
 - This release just fixes the serious segfault problem if nano is
   invoked any way other than using the absolute path.  The bug was
   in the new code for checking whether nano is invoked as 'pico'.
 
-nano-0.9.1 - 04/14/2000
+nano-0.9.1 - 2000.04.14
 - Added Pico compatibility for ^T when in search or switch to switch
   to the opposite function.  Added one to REPLACE_LIST_LEN and
   WHEREIS_LIST_LEN in nano.h, new args to sc_init_one in global.c and
@@ -7959,7 +7955,7 @@ nano-0.9.1 - 04/14/2000
 	- Code to check if nano is invoked as 'pico', and if so
 	  automatically set pico_msgs (Robert Jones).
 
-nano-0.9.0 - 04/07/2000
+nano-0.9.0 - 2000.04.07
 - nano.1, nano.1.html: 	Updated man page with my email address and homepage.
 - winio.c:
   reset_cursor(), update_line():	
@@ -7975,13 +7971,13 @@ nano-0.9.0 - 04/07/2000
 	- Fixed a stupid call to strlenpt with col when we should have
 	  been using actual_col.  Ugh.
 
-nano-0.8.9 - 03/22/2000
+nano-0.8.9 - 2000.03.22
 - nano.c:
   empty_line(), no_spaces(), justify_format(), do_justify():
 		Actually added these (screwup applying patch).
   do_justify():	Added call to set_modified().
 
-nano-0.8.8 - 03/12/2000
+nano-0.8.8 - 2000.03.12
 - Preliminary internationalization support.  Many many functions modified
   to use gettext (via _() macro).  es.po file included. (Jordi Mallach)
   New dirs po/ and intl/, changes to configure.in and Automake.am to
@@ -7999,7 +7995,7 @@ nano-0.8.8 - 03/12/2000
 		on ^L) actually work.
   xplustabs(), xpt(), strlenpt(): Fixed off-by-one buglets (Adam Rogoyski).
 
-nano-0.8.7 - 03/01/2000
+nano-0.8.7 - 2000.03.01
 - main.c:
   do_wrap():	Better fix for segfaults, and fix for lines being wrapped
 		to a single character on one line when no good place to
@@ -8009,7 +8005,7 @@ nano-0.8.7 - 03/01/2000
 		Html version of man page, now included in dist.  For
 		the benefit of nano packages in Linux distributions.
 
-nano-0.8.6 - 02/24/2000
+nano-0.8.6 - 2000.02.24
 - global.c:
   shortcut_init():
 		Added shortcuts for goto_line and do_replace when using
@@ -8025,7 +8021,7 @@ nano-0.8.6 - 02/24/2000
 		Added mail and web page info.
 - README:	Updated mailing list info.
 
-nano-0.8.5 - 02/18/2000
+nano-0.8.5 - 2000.02.18
 - nano.c:
   main():	Finally fixed tilde being input on page up/down keys in
 		certain terminal types.  Fix was input 26->91->5[34] check
@@ -8044,7 +8040,7 @@ nano-0.8.5 - 02/18/2000
 		Added check for constupdate, makes things less choppy
 		(Adam Rogoyski)
 
-nano-0.8.4 - 02/11/2000
+nano-0.8.4 - 2000.02.11
 - Moved global variables that were only (or mostly) used in one file into
   its proper file as a static.  Affects cut.c, nano.c, global.c (Andy Kahn).
 - global.c:	
@@ -8058,7 +8054,7 @@ nano-0.8.4 - 02/11/2000
 - nano.1:	Fixed mail addressed and added mailing list address.
 - README:	Updated my email address and the nano web page.
 
-nano-0.8.3 - 02/08/2000
+nano-0.8.3 - 2000.02.08
 - New Pico mode (-p, --pico), toggles (more) compatibility with the
   Pico messages displayed in the shortcut list.  Note that there are still
   small differences in this mode.
@@ -8098,7 +8094,7 @@ nano-0.8.3 - 02/08/2000
 		Consequently there is a new macro MAIN_VISIBLE which tells
 		how many items in the main list to actually show.
 
-nano-0.8.2 - 02/02/2000
+nano-0.8.2 - 2000.02.02
 - Added initial mouse (-m, --mouse) support.  New global variable
   use_mouse. (Adam Rogoyski)
 
@@ -8114,7 +8110,7 @@ nano-0.8.2 - 02/02/2000
 		Added check for trying to open a directory (currently we
 		segfault on this).  Bug pointed out by Chad Ziccardi.
 
-nano-0.8.1 - 01/28/2000
+nano-0.8.1 - 2000.01.28
 - Implemented Pico's -r (fill) mode, command line flag -r or --fill.  New
   global variable fill, affects check_wrap(), do_wrap(), main(), usage(),
   global.c and proto.h.
@@ -8135,7 +8131,7 @@ do_goto():
 			sc_init_one() to initialize the shortcuts without
 			using {}s (for i18n).
 
-nano-0.8.0 - 01/25/2000
+nano-0.8.0 - 2000.01.25
 - View flag (-v, --view) implemented.  Global variable view_mode, affects
   main loop of nano.c and new_file(). (me)
 - nano.c:
@@ -8176,7 +8172,7 @@ write_file():
 			Added check for HAVE_WRESIZE, new file acconfig.h
 			(me).
 
-nano-0.7.9 - 01/24/2000
+nano-0.7.9 - 2000.01.24
 - New autoindent feature.  Command flag 'i' or '--autoindent'.  New
   function do_char() to clean up character output, global
   variable autoindent in global.c. (Graham Mainwaring)
@@ -8197,7 +8193,7 @@ nano-0.7.9 - 01/24/2000
   global_init():
 		Added more initializations to globals to support do_spell().
 
-nano-0.7.8 - 01/23/2000
+nano-0.7.8 - 2000.01.23
 - Stubbed justify function.  Affects main() in nano.c and nano.h defines.
 - Added Fkey equivalents for Pico compatibility.  Affects nano.h defines
   and main() in nano.c
@@ -8220,7 +8216,7 @@ nano-0.7.8 - 01/23/2000
 		(Andy Kahn). Changed warning message when no termcap lib
 		is found.
 
-nano-0.7.7 - 01/19/2000
+nano-0.7.7 - 2000.01.19
 - Option '-v' for version moved to '-V', because -v is Pico's "read only"
   mode (affects getopt() in main() and usage() function in nano.c
 - New flag -c, always show cursor position.  Affects main() in nano.c and
@@ -8247,7 +8243,7 @@ nano-0.7.7 - 01/19/2000
 	  (-z), --help (-h), --nohelp (-x).
 	- Rewrote signal statements (Adam Rogoyski)
 
-nano 0.7.6 - 01/15/2000
+nano 0.7.6 - 2000.01.15
 - New ChangeLog format
 - nano.c:
   main(): 	Bound CONTROL_H to backspace (oops)