last update for 2007020220070202

33 files changed, 60 insertions, 43 deletions

diff --git a/CHANGES b/CHANGES
index c871fe5f..ad144113 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20070201
+	update US timezone files to save energy
 20070131
 	add /appl/lib/convcs/utf16_btos.b, utf16_stob.b etc [rog]
 20070130
diff --git a/appl/NOTICE b/appl/NOTICE
index 84818206..5e277521 100644
--- a/appl/NOTICE
+++ b/appl/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/appl/lib/NOTICE b/appl/lib/NOTICE
index e8c19e7f..a9a7616f 100644
--- a/appl/lib/NOTICE
+++ b/appl/lib/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (`LGPL') as published by
diff --git a/appl/lib/convcs/mkfile b/appl/lib/convcs/mkfile
index e309f5a0..afdd1ef7 100644
--- a/appl/lib/convcs/mkfile
+++ b/appl/lib/convcs/mkfile
@@ -12,6 +12,8 @@ TARG=\
 	gb2312_btos.dis\
 	utf8_btos.dis\
 	utf8_stob.dis\
+	utf16_btos.dis\
+	utf16_stob.dis\
 
 MODULES=\
 
diff --git a/asm/NOTICE b/asm/NOTICE
index 84818206..5e277521 100644
--- a/asm/NOTICE
+++ b/asm/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/emu/NOTICE b/emu/NOTICE
index b071f58e..c815136b 100644
--- a/emu/NOTICE
+++ b/emu/NOTICE
@@ -8,8 +8,8 @@ file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com)
-	Revisions Copyright © 2000-2006 Lucent Technologies Inc. and others
+	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
+	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
 	Portions Copyright © 2005 Russ Cox, MIT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/include/NOTICE b/include/NOTICE
index e8c19e7f..a9a7616f 100644
--- a/include/NOTICE
+++ b/include/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (`LGPL') as published by
diff --git a/include/version.h b/include/version.h
index cbe8c148..1706a201 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20070123)"
+#define VERSION	"Fourth Edition (20070202)"
diff --git a/lib/convcs/charsets b/lib/convcs/charsets
index c76d90f5..7593c443 100644
--- a/lib/convcs/charsets
+++ b/lib/convcs/charsets
@@ -121,6 +121,24 @@ utf-8=
 	stob=/dis/lib/convcs/utf8_stob.dis
 	btos=/dis/lib/convcs/utf8_btos.dis
 
+utf16=utf-16
+utf-16=
+	desc='Unicode UTF-16'
+	btos=/dis/lib/convcs/utf16_btos.dis
+	stob=/dis/lib/convcs/utf16_stob.dis
+
+utf16le=utf-16le
+utf-16le=
+	desc='Unicode UTF-16 little endian'
+	btos=/dis/lib/convcs/utf16_btos.dis arg=le
+	stob=/dis/lib/convcs/utf16_stob.dis arg=le
+
+utf16be=utf-16be
+utf-16be=
+	desc='Unicode UTF-16 big endian'
+	btos=/dis/lib/convcs/utf16_btos.dis arg=be
+	stob=/dis/lib/convcs/utf16_stob.dis arg=be
+
 # UTF-7
 #utf-7=
 #	desc='Unicode UTF-7'
diff --git a/lib/proto/inferno b/lib/proto/inferno
index 01eb8deb..43bfafd1 100644
--- a/lib/proto/inferno
+++ b/lib/proto/inferno
@@ -885,6 +885,8 @@ appl
 			mkfile
 			utf8_btos.b
 			utf8_stob.b
+			utf16_btos.b
+			utf16_stob.b
 			windows-1250.b
 			windows-1251.b
 			windows-1252.b
diff --git a/lib9/NOTICE b/lib9/NOTICE
index d2099067..d673ec1b 100644
--- a/lib9/NOTICE
+++ b/lib9/NOTICE
@@ -7,7 +7,7 @@ notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Revisions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
+	Revisions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libbio/NOTICE b/libbio/NOTICE
index d2099067..d673ec1b 100644
--- a/libbio/NOTICE
+++ b/libbio/NOTICE
@@ -7,7 +7,7 @@ notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Revisions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
+	Revisions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libdraw/NOTICE b/libdraw/NOTICE
index 39682bb2..030b2faf 100644
--- a/libdraw/NOTICE
+++ b/libdraw/NOTICE
@@ -8,8 +8,8 @@ file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com)
-	Revisions Copyright © 2000-2006 Lucent Technologies Inc. and others
+	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
+	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libdynld/NOTICE b/libdynld/NOTICE
index b90dffa1..fca16552 100644
--- a/libdynld/NOTICE
+++ b/libdynld/NOTICE
@@ -6,7 +6,7 @@ copyright notice that includes the copyright notice and the other
 notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
-	Copyright © 2004-2006 Vita Nuova Holdings Limited (www.vitanuova.com)
+	Copyright © 2004-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libinterp/NOTICE b/libinterp/NOTICE
index 7a10f1ba..9a6619b4 100644
--- a/libinterp/NOTICE
+++ b/libinterp/NOTICE
@@ -1,6 +1,6 @@
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (`LGPL') as published by
diff --git a/libkern/NOTICE b/libkern/NOTICE
index d2099067..d673ec1b 100644
--- a/libkern/NOTICE
+++ b/libkern/NOTICE
@@ -7,7 +7,7 @@ notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Revisions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
+	Revisions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libkeyring/NOTICE b/libkeyring/NOTICE
index e8c19e7f..a9a7616f 100644
--- a/libkeyring/NOTICE
+++ b/libkeyring/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (`LGPL') as published by
diff --git a/libmath/NOTICE b/libmath/NOTICE
index d2099067..d673ec1b 100644
--- a/libmath/NOTICE
+++ b/libmath/NOTICE
@@ -7,7 +7,7 @@ notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Revisions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
+	Revisions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libmemdraw/NOTICE b/libmemdraw/NOTICE
index d2099067..d673ec1b 100644
--- a/libmemdraw/NOTICE
+++ b/libmemdraw/NOTICE
@@ -7,7 +7,7 @@ notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Revisions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
+	Revisions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libmemlayer/NOTICE b/libmemlayer/NOTICE
index d2099067..d673ec1b 100644
--- a/libmemlayer/NOTICE
+++ b/libmemlayer/NOTICE
@@ -7,7 +7,7 @@ notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Revisions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
+	Revisions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com).  All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/libmp/NOTICE b/libmp/NOTICE
index eadfe982..5af44f87 100644
--- a/libmp/NOTICE
+++ b/libmp/NOTICE
@@ -1,4 +1,4 @@
-Copyright © 2000-2006 Lucent Technologies Inc. and others.  All rights reserved.
+Copyright © 2000-2007 Lucent Technologies Inc. and others.  All rights reserved.
 Revisions for use with Inferno © 2006 Vita Nuova Holdings Limited.
 
 This software is provided under the terms of the Lucent Public License, Version 1.02.
diff --git a/libprefab/NOTICE b/libprefab/NOTICE
index e8c19e7f..a9a7616f 100644
--- a/libprefab/NOTICE
+++ b/libprefab/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (`LGPL') as published by
diff --git a/libsec/NOTICE b/libsec/NOTICE
index eadfe982..5af44f87 100644
--- a/libsec/NOTICE
+++ b/libsec/NOTICE
@@ -1,4 +1,4 @@
-Copyright © 2000-2006 Lucent Technologies Inc. and others.  All rights reserved.
+Copyright © 2000-2007 Lucent Technologies Inc. and others.  All rights reserved.
 Revisions for use with Inferno © 2006 Vita Nuova Holdings Limited.
 
 This software is provided under the terms of the Lucent Public License, Version 1.02.
diff --git a/libtk/NOTICE b/libtk/NOTICE
index e8c19e7f..a9a7616f 100644
--- a/libtk/NOTICE
+++ b/libtk/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (`LGPL') as published by
diff --git a/limbo/NOTICE b/limbo/NOTICE
index 84818206..5e277521 100644
--- a/limbo/NOTICE
+++ b/limbo/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/locale/NOTICE b/locale/NOTICE
index 0cf8d194..c2870bcd 100644
--- a/locale/NOTICE
+++ b/locale/NOTICE
@@ -7,7 +7,7 @@ notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Portions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com)
+	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/man/index b/man/index
index cde9c9cb..6895c021 100644
--- a/man/index
+++ b/man/index
@@ -11540,6 +11540,7 @@ copying	/man/1/dd
 copying	/man/1/tail
 copying	/man/10/dev
 copying	/man/10/readnum
+copying	/man/2/json
 copying	/man/2/smtp
 copying	/man/3/ftl
 copying	/man/4/ftpfs
@@ -13189,7 +13190,6 @@ debugging	/man/10/xalloc
 debugging	/man/2/alphabet-intro
 debugging	/man/2/debug
 debugging	/man/2/filter-deflate
-debugging	/man/2/json
 debugging	/man/2/scsiio
 debugging	/man/2/styx
 debugging	/man/2/ubfa
@@ -28281,7 +28281,6 @@ intended	/man/10/allocb
 intended	/man/10/kproc
 intended	/man/10/plan9.ini
 intended	/man/10/xalloc
-intended	/man/2/json
 intended	/man/2/keyring-0intro
 intended	/man/2/math-0intro
 intended	/man/2/prefab-element
@@ -29533,7 +29532,6 @@ jn	/man/2/math-elem
 jo	/man/10/odbc
 joe	/man/1/filename
 joe	/man/10/styxserver
-joe	/man/6/json
 joe	/man/6/ubfa
 joe's	/man/1/filename
 joel	/man/9/canvas
@@ -32785,7 +32783,6 @@ mainly	/man/1/acme
 mainly	/man/10/ar
 mainly	/man/10/styxserver
 mainly	/man/2/ip
-mainly	/man/2/json
 mainly	/man/2/palmfile
 mainly	/man/2/ubfa
 mainly	/man/3/cons
@@ -39297,7 +39294,6 @@ page	/man/2/tabs
 page	/man/2/w3c-css
 page	/man/3/flash
 page	/man/3/ip
-page	/man/6/json
 page	/man/6/keyboard
 page	/man/6/man
 page	/man/6/ubfa
@@ -42224,7 +42220,6 @@ printable	/man/1/strings
 printable	/man/1/xd
 printable	/man/2/bufio
 printable	/man/2/encoding
-printable	/man/2/json
 printable	/man/2/keyring-certtostr
 printable	/man/2/print
 printable	/man/2/sexprs
@@ -45358,6 +45353,7 @@ recursion	/man/1/math-misc
 recursion	/man/2/spree
 recursive	/man/1/sh
 recursive	/man/10/lock
+recursive	/man/2/json
 recursive	/man/6/sexprs
 recursively	/man/1/alphabet-fs
 recursively	/man/1/cp
@@ -58312,7 +58308,6 @@ traces	/man/1/emu
 traces	/man/3/cons
 traceset	/man/2/styxservers
 tracing	/man/2/dhcpclient
-tracing	/man/2/json
 tracing	/man/2/styx
 tracing	/man/2/ubfa
 tracing	/man/3/ftl
@@ -59318,7 +59313,6 @@ uart	/man/10/plan9.ini
 uart0	/man/10/intrenable
 uarts	/man/10/plan9.ini
 ubf	/man/2/ubfa
-ubf	/man/6/json
 ubf	/man/6/ubfa
 ubfa	/man/2/json
 ubfa	/man/2/ubfa
@@ -62285,7 +62279,6 @@ web	/man/1/mux
 web	/man/1/webgrab
 web	/man/2/w3c-css
 web	/man/2/w3c-xpointers
-web	/man/6/json
 web	/man/6/ubfa
 web	/man/8/httpd
 webget	/man/1/charon
@@ -63414,8 +63407,8 @@ wunlock	/man/10/qlock
 ww	/man/1/limbo
 www	/man/1/webgrab
 www.innerhost.vitanuova.com	/man/1/webgrab
+www.json.org	/man/6/json
 www.minitelfr.com	/man/1/miniterm
-www.sics.se	/man/6/json
 www.sics.se	/man/6/ubfa
 www.vitanuova.com	/man/1/webgrab
 www.w3.org	/man/2/w3c-css
diff --git a/module/NOTICE b/module/NOTICE
index e8c19e7f..a9a7616f 100644
--- a/module/NOTICE
+++ b/module/NOTICE
@@ -8,7 +8,7 @@ file such as NOTICE, LICENCE or COPYING.
 
 Copyright © 1995-1999 Lucent Technologies Inc.
 Portions Copyright © 1997-2000 Vita Nuova Limited
-Portions Copyright © 2000-2006 Vita Nuova Holdings Limited
+Portions Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (`LGPL') as published by
diff --git a/os/NOTICE b/os/NOTICE
index 39682bb2..030b2faf 100644
--- a/os/NOTICE
+++ b/os/NOTICE
@@ -8,8 +8,8 @@ file such as NOTICE, LICENCE or COPYING.
 
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com)
-	Revisions Copyright © 2000-2006 Lucent Technologies Inc. and others
+	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
+	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/os/boot/pc/NOTICE b/os/boot/pc/NOTICE
index 2982c51d..fd4b6dcf 100644
--- a/os/boot/pc/NOTICE
+++ b/os/boot/pc/NOTICE
@@ -1,4 +1,4 @@
-Copyright © 1995-2006 Lucent Technologies Inc. and others.  All rights reserved.
-Revisions for use with Inferno © 2003-2006 Vita Nuova Holdings Limited.
+Copyright © 1995-2007 Lucent Technologies Inc. and others.  All rights reserved.
+Revisions for use with Inferno © 2003-2007 Vita Nuova Holdings Limited.
 
 This software is provided under the terms of the Lucent Public License, Version 1.02.
diff --git a/tools/NOTICE b/tools/NOTICE
index 4138c8e7..089b8163 100644
--- a/tools/NOTICE
+++ b/tools/NOTICE
@@ -6,7 +6,7 @@ copyright notice that includes the copyright notice and the other
 notices below.  It is fine (and often tidier) to do that in a separate
 file such as NOTICE, LICENCE or COPYING.
 
-Copyright © 2000-2006 Vita Nuova Holdings Limited
+Copyright © 2000-2007 Vita Nuova Holdings Limited
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (`LGPL') as published by
diff --git a/utils/NOTICE b/utils/NOTICE
index 682cb8cd..7ffa9708 100644
--- a/utils/NOTICE
+++ b/utils/NOTICE
@@ -9,9 +9,9 @@ file such as NOTICE, LICENCE or COPYING.
 	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 	Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
 	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com)
+	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
 	Portions Copyright © 2004,2006 Bruce Ellis
-	Portions Copyright © 2006,2006 C H Forsyth (forsyth@terzarima.net)
+	Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
 	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/utils/libmach/NOTICE b/utils/libmach/NOTICE
index 53798daf..c708cf01 100644
--- a/utils/libmach/NOTICE
+++ b/utils/libmach/NOTICE
@@ -9,7 +9,7 @@ file such as NOTICE, LICENCE or COPYING.
 	Copyright © 1994-1999 Lucent Technologies Inc.
 	Power PC support Copyright © 1995-2004 C H Forsyth (forsyth@terzarima.net).
 	Portions Copyright © 1997-1999 Vita Nuova Limited.
-	Portions Copyright © 2000-2006 Vita Nuova Holdings Limited (www.vitanuova.com).
+	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com).
 	Revisions Copyright © 2000-2004 Lucent Technologies Inc. and others.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy