diff --git a/src/lib-sieve-tool/mail-raw.c b/src/lib-sieve-tool/mail-raw.c
index 572161ade5e9b3819e106eeafdc8fec4464a38f0..2fc1de3580c0707aa35ce180e8f300ebfdedc9ee 100644
--- a/src/lib-sieve-tool/mail-raw.c
+++ b/src/lib-sieve-tool/mail-raw.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* This file was gratefully stolen from dovecot/src/deliver/deliver.c and 
diff --git a/src/lib-sieve-tool/mail-raw.h b/src/lib-sieve-tool/mail-raw.h
index 2834eae36c3fd7924274ed39cf156a4f35d5bf5c..693433720c17ae36d330489d3a26361eadd69ebe 100644
--- a/src/lib-sieve-tool/mail-raw.h
+++ b/src/lib-sieve-tool/mail-raw.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __MAIL_RAW_H
diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index 8215648e0409b87d8d2394c716c4966a8cbd4804..63ee463d5bed928b3f2ca2c85d603a3ece7bc8f5 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve-tool/sieve-tool.h b/src/lib-sieve-tool/sieve-tool.h
index 6b402f0a2f702f2f738cb74c89fe9ffe555d9df4..eeffce7acf7295b0f6772efbb2a2fc6ec4ee7a4f 100644
--- a/src/lib-sieve-tool/sieve-tool.h
+++ b/src/lib-sieve-tool/sieve-tool.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_TOOL_H
diff --git a/src/lib-sieve/cmd-discard.c b/src/lib-sieve/cmd-discard.c
index 24abee22eae2598d56e409d3b438c18f3dcc34ab..6b5e7504750044180501037a1fc305563113ee50 100644
--- a/src/lib-sieve/cmd-discard.c
+++ b/src/lib-sieve/cmd-discard.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/cmd-if.c b/src/lib-sieve/cmd-if.c
index 5ab8ac5b850d0f79b30500b4999b9da534746a85..8cf3a19fa4435e5ad6b6c004caefd3270e9eacd0 100644
--- a/src/lib-sieve/cmd-if.c
+++ b/src/lib-sieve/cmd-if.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/cmd-keep.c b/src/lib-sieve/cmd-keep.c
index 94068fd9cee2b474d35823879123f7501baf2d52..dfc0abfc9e1d8e0504614e00697dea3ac6f3e81c 100644
--- a/src/lib-sieve/cmd-keep.c
+++ b/src/lib-sieve/cmd-keep.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/cmd-redirect.c b/src/lib-sieve/cmd-redirect.c
index 7d9c497533965e02d935d3150e2f1f6127ee161d..0c8398c4dfcb2654333d9be536bd167e5c453002 100644
--- a/src/lib-sieve/cmd-redirect.c
+++ b/src/lib-sieve/cmd-redirect.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/cmd-require.c b/src/lib-sieve/cmd-require.c
index bd7ae1bb9be0828c1f85273a636465913eb515ae..e048e6ea4f1ee4ad88782719c2c079b519a0dc4b 100644
--- a/src/lib-sieve/cmd-require.c
+++ b/src/lib-sieve/cmd-require.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/cmd-stop.c b/src/lib-sieve/cmd-stop.c
index 0629f6dec4f6dbe51db2b83b000113263837d741..595005a7058f36e059bc6a1ff5e9ee1b28f205a3 100644
--- a/src/lib-sieve/cmd-stop.c
+++ b/src/lib-sieve/cmd-stop.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/cmp-i-ascii-casemap.c b/src/lib-sieve/cmp-i-ascii-casemap.c
index b3b9a7aebad6c251a1e6c91f23e53bd1377d3ffa..5e4d4b342f21b79dfeccd8ae4260ed81b7a173aa 100644
--- a/src/lib-sieve/cmp-i-ascii-casemap.c
+++ b/src/lib-sieve/cmp-i-ascii-casemap.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 /* Comparator 'i;ascii-casemap': 
diff --git a/src/lib-sieve/cmp-i-octet.c b/src/lib-sieve/cmp-i-octet.c
index 8903bcc78322dd7ca81eb989d965234023116b45..9fb0d1fa63c7251a3c2adbbf601138d7af300bf6 100644
--- a/src/lib-sieve/cmp-i-octet.c
+++ b/src/lib-sieve/cmp-i-octet.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 /* Comparator 'i;octet': 
diff --git a/src/lib-sieve/ext-encoded-character.c b/src/lib-sieve/ext-encoded-character.c
index 4311152f2f5d301d65d253d7bcbe1ddc13945db6..24f41f74d5bf5fcf9993991b12c59f72677b50e5 100644
--- a/src/lib-sieve/ext-encoded-character.c
+++ b/src/lib-sieve/ext-encoded-character.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension encoded-character 
diff --git a/src/lib-sieve/ext-envelope.c b/src/lib-sieve/ext-envelope.c
index ced44b11bae5f98186aec0bb8730950464e4cf50..8c5ebdc6025c0e9ac261807d1cb6769eb7517b2d 100644
--- a/src/lib-sieve/ext-envelope.c
+++ b/src/lib-sieve/ext-envelope.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension envelope 
diff --git a/src/lib-sieve/ext-fileinto.c b/src/lib-sieve/ext-fileinto.c
index 08976def541dcb635b4900753a12c94e3999fa94..e710a5dff682928792ca213fc753d9b344b59dd4 100644
--- a/src/lib-sieve/ext-fileinto.c
+++ b/src/lib-sieve/ext-fileinto.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension fileinto 
diff --git a/src/lib-sieve/ext-reject.c b/src/lib-sieve/ext-reject.c
index ce8305b8a86443b3761a027d1b1c05b184b10684..77b442a05f40afb0db5e23ebb2c2f468b7ba31d4 100644
--- a/src/lib-sieve/ext-reject.c
+++ b/src/lib-sieve/ext-reject.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension reject 
diff --git a/src/lib-sieve/mcht-contains.c b/src/lib-sieve/mcht-contains.c
index cb47fbc8fba4b6bc9250a5e0ed6d20c9cf4b5415..b648c887dba904c49c66394fdecb9be71a971be7 100644
--- a/src/lib-sieve/mcht-contains.c
+++ b/src/lib-sieve/mcht-contains.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 /* Match-type ':contains' 
diff --git a/src/lib-sieve/mcht-is.c b/src/lib-sieve/mcht-is.c
index ddecb7ccf6b9e20409f2c280905b98273163d5a1..cbde42ac152bdfe47a10153c1f3af720e62df48e 100644
--- a/src/lib-sieve/mcht-is.c
+++ b/src/lib-sieve/mcht-is.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 /* Match-type ':is': 
diff --git a/src/lib-sieve/mcht-matches.c b/src/lib-sieve/mcht-matches.c
index 5c86673df654d25e932cd06f1a93a0ca8c24c229..86f96970b109de8365b7471812ee4e3640a1b762 100644
--- a/src/lib-sieve/mcht-matches.c
+++ b/src/lib-sieve/mcht-matches.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 /* Match-type ':matches' 
diff --git a/src/lib-sieve/plugins/body/ext-body-common.c b/src/lib-sieve/plugins/body/ext-body-common.c
index 754c942fce1c4a59f9022aa8fe8fa90e67aedd37..010881565307efaf9f612adf536e003ea00612f0 100644
--- a/src/lib-sieve/plugins/body/ext-body-common.c
+++ b/src/lib-sieve/plugins/body/ext-body-common.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #include "lib.h"
 #include "mempool.h"
 #include "buffer.h"
diff --git a/src/lib-sieve/plugins/body/ext-body-common.h b/src/lib-sieve/plugins/body/ext-body-common.h
index 67ebbc4b6eab8ea5154cc56c408c6361fade9aa4..edb8fe96f6695373b87f42645a2866951f83b6d0 100644
--- a/src/lib-sieve/plugins/body/ext-body-common.h
+++ b/src/lib-sieve/plugins/body/ext-body-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #ifndef __EXT_BODY_COMMON_H
diff --git a/src/lib-sieve/plugins/body/ext-body.c b/src/lib-sieve/plugins/body/ext-body.c
index 56f67994dd42fbb8b78fa906d259370a8ceeb473..049c13086bdee85ec9f3eaadcf3d9abff177914f 100644
--- a/src/lib-sieve/plugins/body/ext-body.c
+++ b/src/lib-sieve/plugins/body/ext-body.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension body 
diff --git a/src/lib-sieve/plugins/body/tst-body.c b/src/lib-sieve/plugins/body/tst-body.c
index aad6b11ec1c8896ad33c658154c47169bbf56e2e..edc7dc7cd3d9ce725b150e753895a24bac07d1dd 100644
--- a/src/lib-sieve/plugins/body/tst-body.c
+++ b/src/lib-sieve/plugins/body/tst-body.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #include "sieve-extensions.h"
diff --git a/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c b/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c
index 9219302077b2ef267dacc2c5973b13efaa503553..94b382d36e1799d098c28c5440dfa00d39ce3390 100644
--- a/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c
+++ b/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */ 
 
 /* Extension comparator-i;ascii-numeric
diff --git a/src/lib-sieve/plugins/copy/ext-copy.c b/src/lib-sieve/plugins/copy/ext-copy.c
index 26fa3c4fe04f1ed5bae6df214cdc5f0e047679a8..e15d2ec06f4f43a4d2d67aa0e4dae8779dbde67a 100644
--- a/src/lib-sieve/plugins/copy/ext-copy.c
+++ b/src/lib-sieve/plugins/copy/ext-copy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension copy
diff --git a/src/lib-sieve/plugins/enotify/cmd-notify.c b/src/lib-sieve/plugins/enotify/cmd-notify.c
index 47718828a6fcf6f2f5150457150bc57dd5d30c59..a25b588baddceacd0ac750186eb6d34d7e396b78 100644
--- a/src/lib-sieve/plugins/enotify/cmd-notify.c
+++ b/src/lib-sieve/plugins/enotify/cmd-notify.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-common.c b/src/lib-sieve/plugins/enotify/ext-enotify-common.c
index 62734ec818b400ed4f20c667c72cc9f70178ee79..0fa7ba0bddce8f4b3437d61dff8562e98aea12fd 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify-common.c
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-common.h b/src/lib-sieve/plugins/enotify/ext-enotify-common.h
index fbbaac5ca47676a9e168a00877aead9c441de780..a5e8862c7edf5c2822e5d9054f5d7506493e27a3 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify-common.h
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_ENOTIFY_COMMON_H
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-limits.h b/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
index 84cac26652670e1058c90953d1438e841c59306e..1762877ede1cba756972e153d60173a15b5ba63a 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #ifndef __EXT_ENOTIFY_LIMITS_H
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify.c b/src/lib-sieve/plugins/enotify/ext-enotify.c
index 6713b4a6aa848614c4454be047545769af6bdfb7..c0658e78056d17a313bf90add26345365ec84b65 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify.c
+++ b/src/lib-sieve/plugins/enotify/ext-enotify.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension enotify
diff --git a/src/lib-sieve/plugins/enotify/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/ntfy-mailto.c
index 0c36bffafab47504095ab0fab1a4aa28615fb785..663751dd86ed2dff975440baf8721fe7e87d70e9 100644
--- a/src/lib-sieve/plugins/enotify/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/ntfy-mailto.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 /* Notify method mailto
diff --git a/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h b/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
index e4cd496507deeec9ea726efd376e594aa98bd9f2..77b333c5b56a808621cda9d19b61caf2477ea7b4 100644
--- a/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
+++ b/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_EXT_ENOTIFY_H
diff --git a/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c b/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c
index fd643e50dae9e58a5385200a6f886b0df8907280..3a9b182d794996e8a0e23ca4296d95b0bb6f76ad 100644
--- a/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c
+++ b/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include <stdio.h>
diff --git a/src/lib-sieve/plugins/enotify/tst-valid-notify-method.c b/src/lib-sieve/plugins/enotify/tst-valid-notify-method.c
index 847ffbb92735fb5abbe7383caa03c7726c58ab08..779318a7c176f3366ed8346c49e23f2757c8f82c 100644
--- a/src/lib-sieve/plugins/enotify/tst-valid-notify-method.c
+++ b/src/lib-sieve/plugins/enotify/tst-valid-notify-method.c
@@ -1,8 +1,6 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
-#include <stdio.h>
-
 #include "sieve-common.h"
 #include "sieve-commands.h"
 #include "sieve-code.h"
diff --git a/src/lib-sieve/plugins/enotify/vmodf-encodeurl.c b/src/lib-sieve/plugins/enotify/vmodf-encodeurl.c
index 4feef104e943635302083f45c559def7ac272757..1e404ffa86f19dcd154ff7c0083cc2e3f88821cc 100644
--- a/src/lib-sieve/plugins/enotify/vmodf-encodeurl.c
+++ b/src/lib-sieve/plugins/enotify/vmodf-encodeurl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imapflags/cmd-addflag.c b/src/lib-sieve/plugins/imapflags/cmd-addflag.c
index 00844c6acd5b77ea52e114244b96982e86d009eb..fada6c57aab96b0f13eefbffa887d866c4a05995 100644
--- a/src/lib-sieve/plugins/imapflags/cmd-addflag.c
+++ b/src/lib-sieve/plugins/imapflags/cmd-addflag.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imapflags/cmd-removeflag.c b/src/lib-sieve/plugins/imapflags/cmd-removeflag.c
index c5c114b62c1ec1f9bbdb28ff64c68fcc1935a340..65d0c74b69a10f7f23c89e7fd2874ca90603a503 100644
--- a/src/lib-sieve/plugins/imapflags/cmd-removeflag.c
+++ b/src/lib-sieve/plugins/imapflags/cmd-removeflag.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imapflags/cmd-setflag.c b/src/lib-sieve/plugins/imapflags/cmd-setflag.c
index bcce30c566490aebc39efbb712af4af3137b77c4..fb50cb03ad9a58855d8a75e094fa85e2ab07f817 100644
--- a/src/lib-sieve/plugins/imapflags/cmd-setflag.c
+++ b/src/lib-sieve/plugins/imapflags/cmd-setflag.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c b/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
index 1fbc05c6deea7736c0e8a1d3b708f2428f24a9c7..543c3a1b7c2721b9fd33e68866f0a2d8abdaabb8 100644
--- a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
+++ b/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.h b/src/lib-sieve/plugins/imapflags/ext-imapflags-common.h
index 8fcad676c50390a991eda88618fb4d98e8c7f730..9b1f256215454c9b862504a0f33fb60f17aada2a 100644
--- a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.h
+++ b/src/lib-sieve/plugins/imapflags/ext-imapflags-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_IMAPFLAGS_COMMON_H
diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags.c b/src/lib-sieve/plugins/imapflags/ext-imapflags.c
index dd00414f783a02f6c8041ec723dd38ebfa67e08b..7903b28ad0ea0ffdf0df2edd9392380ecead4a92 100644
--- a/src/lib-sieve/plugins/imapflags/ext-imapflags.c
+++ b/src/lib-sieve/plugins/imapflags/ext-imapflags.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension imap4flags
diff --git a/src/lib-sieve/plugins/imapflags/tag-flags.c b/src/lib-sieve/plugins/imapflags/tag-flags.c
index 6a04426b94ef70dae8d5390691d77615071be356..01da24a36084d20724735418a6367e7bb617d10b 100644
--- a/src/lib-sieve/plugins/imapflags/tag-flags.c
+++ b/src/lib-sieve/plugins/imapflags/tag-flags.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/imapflags/tst-hasflag.c b/src/lib-sieve/plugins/imapflags/tst-hasflag.c
index 047913123979cccd51b341235f8d31dc6f1b9ba2..82dda8abc05d02f357fb0b7c0928572ec23a8ee7 100644
--- a/src/lib-sieve/plugins/imapflags/tst-hasflag.c
+++ b/src/lib-sieve/plugins/imapflags/tst-hasflag.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/cmd-import.c b/src/lib-sieve/plugins/include/cmd-import.c
index bc1e9376c5f4afca628c6bda32f8d6c23b02a098..1f17ba4ddf8ac7a53953abee7f507015a20a19a7 100644
--- a/src/lib-sieve/plugins/include/cmd-import.c
+++ b/src/lib-sieve/plugins/include/cmd-import.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/cmd-include.c b/src/lib-sieve/plugins/include/cmd-include.c
index 426fdc556b24d6533b840a7a4541bd7a8b8d05b0..730acf0b748e6a6ad4cedad0277ede4ea3d968aa 100644
--- a/src/lib-sieve/plugins/include/cmd-include.c
+++ b/src/lib-sieve/plugins/include/cmd-include.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/cmd-return.c b/src/lib-sieve/plugins/include/cmd-return.c
index 335d6d0a9e75e62c65438eade281e9d55c779a0b..b666f4c9ce9f3d1fdd8145a8362ef22ca19d0ea1 100644
--- a/src/lib-sieve/plugins/include/cmd-return.c
+++ b/src/lib-sieve/plugins/include/cmd-return.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/ext-include-binary.c b/src/lib-sieve/plugins/include/ext-include-binary.c
index 8d900274433beb04f16499fd59869f232ad93673..b9b9120a37f8d0a5ab8538b158f54891ccdf20bb 100644
--- a/src/lib-sieve/plugins/include/ext-include-binary.c
+++ b/src/lib-sieve/plugins/include/ext-include-binary.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/ext-include-binary.h b/src/lib-sieve/plugins/include/ext-include-binary.h
index 32c86c73ef95b18dee7009c83c961180b443a48a..a6c500fa8a9449d4a7ed2d0c119b2c06f2a29f06 100644
--- a/src/lib-sieve/plugins/include/ext-include-binary.h
+++ b/src/lib-sieve/plugins/include/ext-include-binary.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_INCLUDE_BINARY_H
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index 63cee40fa39bbd223b1cdd864ddfecdd211c41c1..25f136dfd7f223f568797f462826cff41710aaf0 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/include/ext-include-common.h b/src/lib-sieve/plugins/include/ext-include-common.h
index fa3426df4b2f88622e318705d465ce095e86418f..0c7cc3781007b9f7e5af19472d202077252740d0 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.h
+++ b/src/lib-sieve/plugins/include/ext-include-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_INCLUDE_COMMON_H
diff --git a/src/lib-sieve/plugins/include/ext-include-limits.h b/src/lib-sieve/plugins/include/ext-include-limits.h
index b89ae27457dee8737cb0b447cc3f56ffbc2e28e8..57f7970f4dd2fa927ae720fb28d7e46de6353195 100644
--- a/src/lib-sieve/plugins/include/ext-include-limits.h
+++ b/src/lib-sieve/plugins/include/ext-include-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_INCLUDE_LIMITS_H
diff --git a/src/lib-sieve/plugins/include/ext-include-variables.c b/src/lib-sieve/plugins/include/ext-include-variables.c
index 2441801ce8cab928879a105a4f651a9302302aa0..8d8f2088f8c47f110ee3bb2635c36d7f45f972ed 100644
--- a/src/lib-sieve/plugins/include/ext-include-variables.c
+++ b/src/lib-sieve/plugins/include/ext-include-variables.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/plugins/include/ext-include-variables.h b/src/lib-sieve/plugins/include/ext-include-variables.h
index 3a0e4185c2778a9c5fcc5be226145f73e591dc65..19e1b6a8a4a40e282946dc8f891f96a3517b38c1 100644
--- a/src/lib-sieve/plugins/include/ext-include-variables.h
+++ b/src/lib-sieve/plugins/include/ext-include-variables.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_INCLUDE_VARIABLES_H
diff --git a/src/lib-sieve/plugins/include/ext-include.c b/src/lib-sieve/plugins/include/ext-include.c
index c7a94b8e6e66c09665404d3b4a1ef71d6b5c093f..88e1ab72bf4fa0c82f38021ed9d1dd4111081557 100644
--- a/src/lib-sieve/plugins/include/ext-include.c
+++ b/src/lib-sieve/plugins/include/ext-include.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension include
diff --git a/src/lib-sieve/plugins/regex/ext-regex-common.c b/src/lib-sieve/plugins/regex/ext-regex-common.c
index 4601047333d735cee76508a38dc1b22b8c4589b3..a1aa90ebd9208023ab1f8e548793e51daf6ce51a 100644
--- a/src/lib-sieve/plugins/regex/ext-regex-common.c
+++ b/src/lib-sieve/plugins/regex/ext-regex-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/plugins/regex/ext-regex-common.h b/src/lib-sieve/plugins/regex/ext-regex-common.h
index cc638b69b8cefd17bb3a4de457c52e752de9486c..9a0452ecf92dce8c11f6b27d166b925b3feeb763 100644
--- a/src/lib-sieve/plugins/regex/ext-regex-common.h
+++ b/src/lib-sieve/plugins/regex/ext-regex-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_REGEX_COMMON_H
diff --git a/src/lib-sieve/plugins/regex/ext-regex.c b/src/lib-sieve/plugins/regex/ext-regex.c
index dda0050795310445ed3ff24309aa10a35c601aca..5686a8039b67f3cd9a66ca41f772bb6e4d646d08 100644
--- a/src/lib-sieve/plugins/regex/ext-regex.c
+++ b/src/lib-sieve/plugins/regex/ext-regex.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension regex 
diff --git a/src/lib-sieve/plugins/regex/mcht-regex.c b/src/lib-sieve/plugins/regex/mcht-regex.c
index 26be8f668ed11c6281aa1993ea1f0c55b3fa2eb1..7707c92e3d420ee49206dfda416988a5de72092e 100644
--- a/src/lib-sieve/plugins/regex/mcht-regex.c
+++ b/src/lib-sieve/plugins/regex/mcht-regex.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Match-type ':regex'
diff --git a/src/lib-sieve/plugins/relational/ext-relational-common.c b/src/lib-sieve/plugins/relational/ext-relational-common.c
index bf688d47e5c3d7d9ca1b6201da6c1fffb9bb5218..da7d65d7eb9c48819f371f843ad1952925a8638a 100644
--- a/src/lib-sieve/plugins/relational/ext-relational-common.c
+++ b/src/lib-sieve/plugins/relational/ext-relational-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Syntax:
diff --git a/src/lib-sieve/plugins/relational/ext-relational-common.h b/src/lib-sieve/plugins/relational/ext-relational-common.h
index 195cf2fda587f85cbc3cb6dcec8677a6d1bd5d04..debd5428ed9f1c1c01fa313a7949ff70638c8b00 100644
--- a/src/lib-sieve/plugins/relational/ext-relational-common.h
+++ b/src/lib-sieve/plugins/relational/ext-relational-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #ifndef __EXT_RELATIONAL_COMMON_H
diff --git a/src/lib-sieve/plugins/relational/ext-relational.c b/src/lib-sieve/plugins/relational/ext-relational.c
index 752111666dc2adaed624863a510f7c6f346f5034..b30bf10472740cd98fb57a256ca6db1b5325c560 100644
--- a/src/lib-sieve/plugins/relational/ext-relational.c
+++ b/src/lib-sieve/plugins/relational/ext-relational.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension relational 
diff --git a/src/lib-sieve/plugins/relational/mcht-count.c b/src/lib-sieve/plugins/relational/mcht-count.c
index fcc8f25238c4b9fba9caf89f938747cd34256a95..cf0296e12192d27d263a0cce2bd1079a94005205 100644
--- a/src/lib-sieve/plugins/relational/mcht-count.c
+++ b/src/lib-sieve/plugins/relational/mcht-count.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 /* Match-type ':count' 
diff --git a/src/lib-sieve/plugins/relational/mcht-value.c b/src/lib-sieve/plugins/relational/mcht-value.c
index c259583db0ea91a37ea4e6c4c8b9f91f118a60ba..865e8a61c12dd04ed6e349370d3030994bc1720a 100644
--- a/src/lib-sieve/plugins/relational/mcht-value.c
+++ b/src/lib-sieve/plugins/relational/mcht-value.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/subaddress/ext-subaddress.c b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
index e2329d6b8e76d029b3a974579b27a28915242019..14841b08b984c3f5b0a971e86c0df37bc85f481f 100644
--- a/src/lib-sieve/plugins/subaddress/ext-subaddress.c
+++ b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension subaddress 
diff --git a/src/lib-sieve/plugins/vacation/cmd-vacation.c b/src/lib-sieve/plugins/vacation/cmd-vacation.c
index a1d23da554b07f642e42b176099ca7fe74cd515c..9818421c273b1061ff02f866a130b11b0d59991d 100644
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/vacation/ext-vacation-common.h b/src/lib-sieve/plugins/vacation/ext-vacation-common.h
index f7c394e9de62baeb5632c1b01cb8006114080b76..0368e4e2da515d64189ff03d0bbf270890fdda40 100644
--- a/src/lib-sieve/plugins/vacation/ext-vacation-common.h
+++ b/src/lib-sieve/plugins/vacation/ext-vacation-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_VACATION_COMMON_H
diff --git a/src/lib-sieve/plugins/vacation/ext-vacation.c b/src/lib-sieve/plugins/vacation/ext-vacation.c
index 1fedc3667137e20b0b030a7825301258317c34b1..5253ad533818ab1bf86630e343a0bcea6b0cc72f 100644
--- a/src/lib-sieve/plugins/vacation/ext-vacation.c
+++ b/src/lib-sieve/plugins/vacation/ext-vacation.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension vacation
diff --git a/src/lib-sieve/plugins/variables/cmd-set.c b/src/lib-sieve/plugins/variables/cmd-set.c
index 759f9d2c8935aa250c9dd84749c7e96a66c2095d..6195d5519cb3a55ec460d49daf09a753c9ae3a6c 100644
--- a/src/lib-sieve/plugins/variables/cmd-set.c
+++ b/src/lib-sieve/plugins/variables/cmd-set.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-arguments.c b/src/lib-sieve/plugins/variables/ext-variables-arguments.c
index 53c6ccd714c49a96c3b7c59c45021e91b8d60004..b7904537e186cfccd48629a06e5985c69d104a80 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-arguments.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-arguments.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-arguments.h b/src/lib-sieve/plugins/variables/ext-variables-arguments.h
index ceb6692345700f4ff16dad2ba5223243808a4624..785899fe806ba095cb0f37b2e56ef7757db37570 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-arguments.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-arguments.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_ARGUMENTS_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.c b/src/lib-sieve/plugins/variables/ext-variables-common.c
index bab1ce9b5afcdbe2ce0aaeec30c719e60ef40758..92d9e780df40e87a3136ce78516956874c1e1aac 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.h b/src/lib-sieve/plugins/variables/ext-variables-common.h
index df1d09d0c8ade14b2f582a87e0216f18eac7c0e9..0fa046beb18c8439edab549e1ed6fceec3bb8ff4 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_COMMON_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-dump.c b/src/lib-sieve/plugins/variables/ext-variables-dump.c
index 01ba971e5ae0146c746e259e3206999c9d9ca906..f42ce9280d32722be62cdb885da9e22e0c7013ba 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-dump.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-dump.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-dump.h b/src/lib-sieve/plugins/variables/ext-variables-dump.h
index e5fe6c27db4bfe1af0a3f3a0ce3dc852ec6ba398..c1d1a0ded74340c4dc19fd510674a9203a0a8e7e 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-dump.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-dump.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_DUMP_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-limits.h b/src/lib-sieve/plugins/variables/ext-variables-limits.h
index abe07c8431fe1f3301a088823c31f2615ca4e664..087964f2a2e00ff1a41a5f7b99e70972b4502e53 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-limits.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_LIMITS_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-modifiers.c b/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
index d1eeeb0100811834c14f15b24e71ea0f83751c44..2a5bedec3d5313feb787c64c7949a1f6b3bb7305 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-modifiers.h b/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
index df63a30631f7b6758eaf28adde40d997fc29614b..deb47e4965787210cf6dde9a42d0b876a91eef06 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_MODIFIERS_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.c b/src/lib-sieve/plugins/variables/ext-variables-name.c
index 9a829c5b96a6ff7d2ec8120332e198f3bdfb7b67..7a23e6c983c57d03f51a481b0564de6a22bc1f4c 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.h b/src/lib-sieve/plugins/variables/ext-variables-name.h
index 18e10ff83c23845fa725f1260ab78511f5027f92..ab5e34636e8293e3baee901ae90729a426680550 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_NAME
diff --git a/src/lib-sieve/plugins/variables/ext-variables-operands.c b/src/lib-sieve/plugins/variables/ext-variables-operands.c
index dc6333c54f57a4c79749977eda1ba9f72b075a8c..0a52df147e6f511519a24c47d638062f6a73260a 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-operands.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-operands.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/plugins/variables/ext-variables-operands.h b/src/lib-sieve/plugins/variables/ext-variables-operands.h
index a56af944df5d69183e028992f0c1979b522dc6ef..e5eee69cd2d4b34cf005776564ad51ea4c775f49 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-operands.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-operands.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __EXT_VARIABLES_OPERANDS_H
diff --git a/src/lib-sieve/plugins/variables/ext-variables.c b/src/lib-sieve/plugins/variables/ext-variables.c
index 54d140bd80bcf53048c49ab8c803ecafc025c7bd..6734b71d5797eec8d638cd6ab4952f269030488e 100644
--- a/src/lib-sieve/plugins/variables/ext-variables.c
+++ b/src/lib-sieve/plugins/variables/ext-variables.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension variables 
diff --git a/src/lib-sieve/plugins/variables/sieve-ext-variables.h b/src/lib-sieve/plugins/variables/sieve-ext-variables.h
index 3470e5f047cf690ee8c843ea8cd6eb65119a3ce8..f65bd2ff73974cb40c6aa6f2dab4a020ebe37fb8 100644
--- a/src/lib-sieve/plugins/variables/sieve-ext-variables.h
+++ b/src/lib-sieve/plugins/variables/sieve-ext-variables.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* 
diff --git a/src/lib-sieve/plugins/variables/tst-string.c b/src/lib-sieve/plugins/variables/tst-string.c
index 4b7f78086c45433af3a9bbb53d6f129df7c0cc69..08656c27e5f8a18718a287446e7db30daf031836 100644
--- a/src/lib-sieve/plugins/variables/tst-string.c
+++ b/src/lib-sieve/plugins/variables/tst-string.c
@@ -1,8 +1,6 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
-#include <stdio.h>
-
 #include "sieve-common.h"
 #include "sieve-commands.h"
 #include "sieve-code.h"
diff --git a/src/lib-sieve/rfc2822.c b/src/lib-sieve/rfc2822.c
index acbc73249137d8a8a7a3387a8ecd95f92298d333..ec7fad85ef917515741d58bcbfa7595c67743740 100644
--- a/src/lib-sieve/rfc2822.c
+++ b/src/lib-sieve/rfc2822.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 /* NOTE: much of the functionality implemented here should eventually appear
diff --git a/src/lib-sieve/rfc2822.h b/src/lib-sieve/rfc2822.h
index 2476d11baca0cb1e3cbe4dc57529456a852f811a..f194327afd18d6d5b0601a91ae827bb573c56e46 100644
--- a/src/lib-sieve/rfc2822.h
+++ b/src/lib-sieve/rfc2822.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #ifndef __RFC2822_H
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index 8bd2b4beb27e98b58448a2be8cf7c17a693e5e56..110678ebbe86cd06e62c188a34292cd40942ac4f 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-actions.h b/src/lib-sieve/sieve-actions.h
index 992f754e2e927cc01c239665b42624ab6e9825a9..47aca68e60031b01597ab4c5df89867fc1ab057c 100644
--- a/src/lib-sieve/sieve-actions.h
+++ b/src/lib-sieve/sieve-actions.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_ACTIONS_H
diff --git a/src/lib-sieve/sieve-address-parts.c b/src/lib-sieve/sieve-address-parts.c
index 98bff09fb696077a569fefb4e74211c83ed34395..9308c18965133bbd9f25a182679c2cced7d00e4d 100644
--- a/src/lib-sieve/sieve-address-parts.c
+++ b/src/lib-sieve/sieve-address-parts.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-address-parts.h b/src/lib-sieve/sieve-address-parts.h
index f67169b8792aa7e950ec75fa022ac20a52dd582b..84540c8533aa38fa077ddd6aea7cc972bd30e2de 100644
--- a/src/lib-sieve/sieve-address-parts.h
+++ b/src/lib-sieve/sieve-address-parts.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_ADDRESS_PARTS_H
diff --git a/src/lib-sieve/sieve-address.c b/src/lib-sieve/sieve-address.c
index 35593ae4f4fac5bbad8376eaaba3ba8eadbdc020..3e47a2eeb8e85cc9acd4fb429489e24cbab35762 100644
--- a/src/lib-sieve/sieve-address.c
+++ b/src/lib-sieve/sieve-address.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-address.h b/src/lib-sieve/sieve-address.h
index b93c8d15962d2b61d7da1ca8cae53b9fa43ac64d..200bcb811a085d8608a0ef5fe012c96594f4b841 100644
--- a/src/lib-sieve/sieve-address.h
+++ b/src/lib-sieve/sieve-address.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_ADDRESS_H
diff --git a/src/lib-sieve/sieve-ast.c b/src/lib-sieve/sieve-ast.c
index 4bb4ca0546fa239315a083f9eac81e6e08203ef3..0a46672363b13503c86b95e31fcb3b061b208788 100644
--- a/src/lib-sieve/sieve-ast.c
+++ b/src/lib-sieve/sieve-ast.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-ast.h b/src/lib-sieve/sieve-ast.h
index 68c7175bfac15ec3df5e527766a1d971e4433bbf..3109fab6d69c177a54ff4a63e21667ace4150fb4 100644
--- a/src/lib-sieve/sieve-ast.h
+++ b/src/lib-sieve/sieve-ast.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_AST_H
diff --git a/src/lib-sieve/sieve-binary-dumper.c b/src/lib-sieve/sieve-binary-dumper.c
index 911e319b104566ee5e9af6492b7983b745f9b9c7..fa6b92a511301f294f2da88635eaca637b772ad5 100644
--- a/src/lib-sieve/sieve-binary-dumper.c
+++ b/src/lib-sieve/sieve-binary-dumper.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-binary-dumper.h b/src/lib-sieve/sieve-binary-dumper.h
index a959f337ee8c27a1dae35ae27707c3669d9bfcfe..ee583318c1827c7b891bac01d5823b0250db4c56 100644
--- a/src/lib-sieve/sieve-binary-dumper.h
+++ b/src/lib-sieve/sieve-binary-dumper.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_BINARY_DUMPER_H
diff --git a/src/lib-sieve/sieve-binary.c b/src/lib-sieve/sieve-binary.c
index f8523aadc0b517758366eca4703d96003f4ac1c9..c90b26224bc1ac18fe956ba50265c69017a2060b 100644
--- a/src/lib-sieve/sieve-binary.c
+++ b/src/lib-sieve/sieve-binary.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-binary.h b/src/lib-sieve/sieve-binary.h
index adac68cc0b3f902b4f7ad515e0c4b3231789f497..dcc170004eff7ce7e76b4f2413ecdf33bb9f9154 100644
--- a/src/lib-sieve/sieve-binary.h
+++ b/src/lib-sieve/sieve-binary.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_BINARY_H
diff --git a/src/lib-sieve/sieve-code-dumper.c b/src/lib-sieve/sieve-code-dumper.c
index f29ba55dec25bd88a4945b8e4082a9795e7d93a7..443db09d25dbbac241e3f8b68f9e5031aaceefcb 100644
--- a/src/lib-sieve/sieve-code-dumper.c
+++ b/src/lib-sieve/sieve-code-dumper.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include <stdio.h>
diff --git a/src/lib-sieve/sieve-code-dumper.h b/src/lib-sieve/sieve-code-dumper.h
index cad637a20a1e0ba811bd49faabbfbc1081a7326a..58b6a99199dedeac8f929987d85fa49c847a07ef 100644
--- a/src/lib-sieve/sieve-code-dumper.h
+++ b/src/lib-sieve/sieve-code-dumper.h
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #ifndef __SIEVE_CODE_DUMPER_H
 #define __SIEVE_CODE_DUMPER_H
 
diff --git a/src/lib-sieve/sieve-code.c b/src/lib-sieve/sieve-code.c
index 3d0f6d4ab1aba98bf02815da456c38602c8b3343..7973bb2b57504c920d935341c49df659f9696ecd 100644
--- a/src/lib-sieve/sieve-code.c
+++ b/src/lib-sieve/sieve-code.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-code.h b/src/lib-sieve/sieve-code.h
index 2cfb3fdefa03d1a7bad4fec5b7609056ad21a6a2..cfad35b06ff1dff36f25888629e9bce05f9889a5 100644
--- a/src/lib-sieve/sieve-code.h
+++ b/src/lib-sieve/sieve-code.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #ifndef __SIEVE_CODE_H
diff --git a/src/lib-sieve/sieve-commands.c b/src/lib-sieve/sieve-commands.c
index 58f7125824301d4299e7222d7752eb772925469e..a73b5c7fd00c1970b75af877f801be1586c2ca13 100644
--- a/src/lib-sieve/sieve-commands.c
+++ b/src/lib-sieve/sieve-commands.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-commands.h b/src/lib-sieve/sieve-commands.h
index 710afed83be126e1819de474a7b14b8adeae282d..9ad11388484eccfc6bb08594371e3103c167f0df 100644
--- a/src/lib-sieve/sieve-commands.h
+++ b/src/lib-sieve/sieve-commands.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_COMMANDS_H
diff --git a/src/lib-sieve/sieve-common.h b/src/lib-sieve/sieve-common.h
index f6dd3debd9bb24f17e71f4bb7094b8f91d7c4c75..1f4806215f4a8b02d0f0bea21d9c048720be6969 100644
--- a/src/lib-sieve/sieve-common.h
+++ b/src/lib-sieve/sieve-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_COMMON_H
diff --git a/src/lib-sieve/sieve-comparators.c b/src/lib-sieve/sieve-comparators.c
index eabe577fb9197dab14038e080249823fdd6cdc9c..382db2780883b7cd395c6aa1630087b044c6548f 100644
--- a/src/lib-sieve/sieve-comparators.c
+++ b/src/lib-sieve/sieve-comparators.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-comparators.h b/src/lib-sieve/sieve-comparators.h
index c3adb7199c97509a094fd55f0ee78ac0eb559f6b..85a28b41edd37539c751fa440486d90b657f9478 100644
--- a/src/lib-sieve/sieve-comparators.h
+++ b/src/lib-sieve/sieve-comparators.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_COMPARATORS_H
diff --git a/src/lib-sieve/sieve-config.h b/src/lib-sieve/sieve-config.h
index 75b6f1c92df09c2a0ce35143bc9b8b45d9a7f5b2..a6a9f4f696eb528223c69c1ea4a5fdf3ee43b6c3 100644
--- a/src/lib-sieve/sieve-config.h
+++ b/src/lib-sieve/sieve-config.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_CONFIG_H
diff --git a/src/lib-sieve/sieve-dump.h b/src/lib-sieve/sieve-dump.h
index 8fe6cb3be01d1e41d43069af4b8c2c4a03123389..f102b93a8c7b8175822409260c06c6848091813f 100644
--- a/src/lib-sieve/sieve-dump.h
+++ b/src/lib-sieve/sieve-dump.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_DUMP_H
diff --git a/src/lib-sieve/sieve-error-private.h b/src/lib-sieve/sieve-error-private.h
index 9095e9f017af44faca7a07e7246f0350bad7d68c..0a22c4e736e249dc913b94fc994bb8cff8a2a074 100644
--- a/src/lib-sieve/sieve-error-private.h
+++ b/src/lib-sieve/sieve-error-private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_ERROR_PRIVATE_H
diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c
index 519d491e75a1f4a5209bc306ed9c741cf3e36618..ded587a299a38aea8221deaa48583ec0b87bd23d 100644
--- a/src/lib-sieve/sieve-error.c
+++ b/src/lib-sieve/sieve-error.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-error.h b/src/lib-sieve/sieve-error.h
index 5b7254a6f7eef2e91ae0961bd8572b973afd5619..0e0cf53c0cf84d853739e6bfb06cebe7439b070e 100644
--- a/src/lib-sieve/sieve-error.h
+++ b/src/lib-sieve/sieve-error.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_ERROR_H
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index f74d351e2cdccba1d08f7d027cc643f634b54958..19a56ab551f25ea7f28676c2d38e14300f61764d 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-extensions.h b/src/lib-sieve/sieve-extensions.h
index fe0e2316a048495077f6df9700e7529458edd92e..18ebbcdb3a72a66a03ba866437141ecf060ee8ce 100644
--- a/src/lib-sieve/sieve-extensions.h
+++ b/src/lib-sieve/sieve-extensions.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_EXTENSIONS_H
diff --git a/src/lib-sieve/sieve-generator.c b/src/lib-sieve/sieve-generator.c
index 119b117875b00dc34029d979d19910c465878fb2..df5a1d879da0384a24f26483bc3212438d112e3a 100644
--- a/src/lib-sieve/sieve-generator.c
+++ b/src/lib-sieve/sieve-generator.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-generator.h b/src/lib-sieve/sieve-generator.h
index bc7921b46b62e19d6fe751ca2ce3f6428fc3f665..7d65f6c86a3250f928d3b01ea29e06a408d62c37 100644
--- a/src/lib-sieve/sieve-generator.h
+++ b/src/lib-sieve/sieve-generator.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_GENERATOR_H
diff --git a/src/lib-sieve/sieve-interpreter.c b/src/lib-sieve/sieve-interpreter.c
index 69b1e845e6ead4e6c6f4ff98ca3632d6353ad074..de524d20e0bdbe0c1a161dca5284ba1a50795481 100644
--- a/src/lib-sieve/sieve-interpreter.c
+++ b/src/lib-sieve/sieve-interpreter.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-interpreter.h b/src/lib-sieve/sieve-interpreter.h
index 49089f06757031d92274dbeddcb8e2e17a621641..f677d9507d7c5c7d8aa247103fd663fb3437d0ca 100644
--- a/src/lib-sieve/sieve-interpreter.h
+++ b/src/lib-sieve/sieve-interpreter.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_INTERPRETER_H
diff --git a/src/lib-sieve/sieve-lexer.c b/src/lib-sieve/sieve-lexer.c
index 4021da440c9d28fdbb9b57208633da674e10cd7a..dbc7d9e915c4d137c8d1da353b1fe9779baabd69 100644
--- a/src/lib-sieve/sieve-lexer.c
+++ b/src/lib-sieve/sieve-lexer.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-lexer.h b/src/lib-sieve/sieve-lexer.h
index 7d13b41e0afe4c826a5b994c1b4555c36768b267..2a73fb5199cf45f99d70d825f4a07900d1f5138f 100644
--- a/src/lib-sieve/sieve-lexer.h
+++ b/src/lib-sieve/sieve-lexer.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_LEXER_H
diff --git a/src/lib-sieve/sieve-limits.c b/src/lib-sieve/sieve-limits.c
index 624e702007cf0780689de5a8cf1838bb58da51a5..dcc664f24727f06964b5b1b809c9ed4a7996eb57 100644
--- a/src/lib-sieve/sieve-limits.c
+++ b/src/lib-sieve/sieve-limits.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/sieve-limits.h b/src/lib-sieve/sieve-limits.h
index 375815afb96f5138c47f2173ee93e273dcf1c235..94f6a2ad1b55899aa16cd554b89d4ae88552741b 100644
--- a/src/lib-sieve/sieve-limits.h
+++ b/src/lib-sieve/sieve-limits.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_LIMITS_H
diff --git a/src/lib-sieve/sieve-match-types.c b/src/lib-sieve/sieve-match-types.c
index 757e4937d56d2b8c9ae75c4fff2a01ae3853ce82..6a5b33962014efca8795b59e12d962b8a57b6edc 100644
--- a/src/lib-sieve/sieve-match-types.c
+++ b/src/lib-sieve/sieve-match-types.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #include <stdio.h>
diff --git a/src/lib-sieve/sieve-match-types.h b/src/lib-sieve/sieve-match-types.h
index a501952fe80d4218beb200f5ffb9549087d89553..ba073443d45e16ede15228cd0194a135f7077224 100644
--- a/src/lib-sieve/sieve-match-types.h
+++ b/src/lib-sieve/sieve-match-types.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #ifndef __SIEVE_MATCH_TYPES_H
diff --git a/src/lib-sieve/sieve-match.c b/src/lib-sieve/sieve-match.c
index 37615566e075a2a9cdffcdb34d2b2082e88fe3d3..0be2a094ff6c367da1edcbaec2b21e150bef89ce 100644
--- a/src/lib-sieve/sieve-match.c
+++ b/src/lib-sieve/sieve-match.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-match.h b/src/lib-sieve/sieve-match.h
index b34a0c668dc8a128ddfe8f2dc83bea9d7e2dcfae..ea602f9b8e57bbe25efd9f7d3a2551b90c744d53 100644
--- a/src/lib-sieve/sieve-match.h
+++ b/src/lib-sieve/sieve-match.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #ifndef __SIEVE_MATCH_H
diff --git a/src/lib-sieve/sieve-message.c b/src/lib-sieve/sieve-message.c
index 61901e8fb38758305546e2540b5599aeac0dfc47..9c290747bc54ccf0ac1bbe5d5f712c9409115d50 100644
--- a/src/lib-sieve/sieve-message.c
+++ b/src/lib-sieve/sieve-message.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-message.h b/src/lib-sieve/sieve-message.h
index aa0c8d7d6587fedb43f4c7695842d8ca46dca4d1..8f7f236e7452002c5e063179e4f273997ac69cc8 100644
--- a/src/lib-sieve/sieve-message.h
+++ b/src/lib-sieve/sieve-message.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_MESSAGE_H
diff --git a/src/lib-sieve/sieve-objects.c b/src/lib-sieve/sieve-objects.c
index 3c09df81a83d5a4d245e04ecc9c0c0ecea166616..d829d6c0c5ec78d38311af0ad45f4aafe2979e77 100644
--- a/src/lib-sieve/sieve-objects.c
+++ b/src/lib-sieve/sieve-objects.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/sieve-objects.h b/src/lib-sieve/sieve-objects.h
index 1099d2d2b22e88e2c9b134377d20962bfa5aaa3d..035e35678871fc7a12df93ba06edde58de5c084b 100644
--- a/src/lib-sieve/sieve-objects.h
+++ b/src/lib-sieve/sieve-objects.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_OBJECTS_H
diff --git a/src/lib-sieve/sieve-parser.c b/src/lib-sieve/sieve-parser.c
index 03215b283ec4cfde73f1f15f86d83a4da94f884d..b07c5dd81677d2751d04f2104e2b3ac91ea2d406 100644
--- a/src/lib-sieve/sieve-parser.c
+++ b/src/lib-sieve/sieve-parser.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #include <stdio.h>
diff --git a/src/lib-sieve/sieve-parser.h b/src/lib-sieve/sieve-parser.h
index e535ace3e981b060ff2a32d1708d6d7cdcb2bb47..5c4823cae869b324a29619bbf512be473d7073c3 100644
--- a/src/lib-sieve/sieve-parser.h
+++ b/src/lib-sieve/sieve-parser.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_PARSER_H
diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c
index 0ed5e1d43e8bd881e537791491e4c6f633465b04..ac51b7263b716d3832bac2bbf83923b62740621d 100644
--- a/src/lib-sieve/sieve-result.c
+++ b/src/lib-sieve/sieve-result.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
  
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-result.h b/src/lib-sieve/sieve-result.h
index 30a78b6a27c80c15fe95f64b953840ad940e94fb..27990d981fc718296d1bf2b682d9c4361a35fcf1 100644
--- a/src/lib-sieve/sieve-result.h
+++ b/src/lib-sieve/sieve-result.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_RESULT_H
diff --git a/src/lib-sieve/sieve-script-private.h b/src/lib-sieve/sieve-script-private.h
index bac21f4f234b621692bc9ea2552b93daf3a3a76b..69f572fd3aca80e9e5bb08a4d439777f46215760 100644
--- a/src/lib-sieve/sieve-script-private.h
+++ b/src/lib-sieve/sieve-script-private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_SCRIPT_PRIVATE_H
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index db4701560c586ec770f154f880be648f36e1399b..5e56d049898ca3496650fd1da5668ef621d9ee88 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-script.h b/src/lib-sieve/sieve-script.h
index fbdd3b8ed02af5603b08c3d6cd75bb67dadcabae..6ed6511448114c7d8faf6cc32643584642e53768 100644
--- a/src/lib-sieve/sieve-script.h
+++ b/src/lib-sieve/sieve-script.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __SIEVE_SCRIPT_H
diff --git a/src/lib-sieve/sieve-types.h b/src/lib-sieve/sieve-types.h
index ef82b6011c0b474a424deeb5aac4404437650042..b884ef7dd91ba98479931c60c3931d85756cd42d 100644
--- a/src/lib-sieve/sieve-types.h
+++ b/src/lib-sieve/sieve-types.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_TYPES_H
diff --git a/src/lib-sieve/sieve-validator.c b/src/lib-sieve/sieve-validator.c
index 3b829138b74227839aa7e1496173141c22c42267..95900fc88a7c6a3bfd947c5e2326d2347bb4cd35 100644
--- a/src/lib-sieve/sieve-validator.c
+++ b/src/lib-sieve/sieve-validator.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve-validator.h b/src/lib-sieve/sieve-validator.h
index a48dbd8c72b9d60aff27416f7b568eca04e108e7..c16070664351a9e1da99d03c812626e449e194bf 100644
--- a/src/lib-sieve/sieve-validator.h
+++ b/src/lib-sieve/sieve-validator.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
  
 #ifndef __SIEVE_VALIDATOR_H
diff --git a/src/lib-sieve/sieve.c b/src/lib-sieve/sieve.c
index 6f6b6465e92776b554b6188a3d16d7292cccd399..0cf07733a4a4aace1e21e09b8507ffad2251a4b2 100644
--- a/src/lib-sieve/sieve.c
+++ b/src/lib-sieve/sieve.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/sieve.h b/src/lib-sieve/sieve.h
index e8091a0c48438d19fb6b79225f5892751aa61877..7acb85ca0bb1477f6ac3583c84c64f8193a14229 100644
--- a/src/lib-sieve/sieve.h
+++ b/src/lib-sieve/sieve.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #ifndef __SIEVE_H
diff --git a/src/lib-sieve/tst-address.c b/src/lib-sieve/tst-address.c
index 78099c82a997ee26fd9b754af5e81aef7f88ed98..8b2a6f5daf87046eb2f866f37b2971989e0408e2 100644
--- a/src/lib-sieve/tst-address.c
+++ b/src/lib-sieve/tst-address.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/tst-allof.c b/src/lib-sieve/tst-allof.c
index 40e375bdfe8c827950b9cef3d2fcc8d864562508..da82fef3f033ec34ccf7428b98d91f41271b0985 100644
--- a/src/lib-sieve/tst-allof.c
+++ b/src/lib-sieve/tst-allof.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/tst-anyof.c b/src/lib-sieve/tst-anyof.c
index 8cbb5891b28f66effc941b6ff764e2831330f84d..e560aa8a772176f3e7b1728244e826a0c74229bf 100644
--- a/src/lib-sieve/tst-anyof.c
+++ b/src/lib-sieve/tst-anyof.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/tst-exists.c b/src/lib-sieve/tst-exists.c
index a2760ae13099e5c18ef51185be24a0883d88482f..ee064e9e9062f87778f5cde1e78e4e5bc344a71c 100644
--- a/src/lib-sieve/tst-exists.c
+++ b/src/lib-sieve/tst-exists.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/tst-header.c b/src/lib-sieve/tst-header.c
index 8023d03cc399d48ccc1b6343987c0fb369c2bb2e..b358d9375f15ddfaa9317569936d15aed18170b6 100644
--- a/src/lib-sieve/tst-header.c
+++ b/src/lib-sieve/tst-header.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/tst-not.c b/src/lib-sieve/tst-not.c
index de94a31b4a50c4e8125faa26476a183ef5e0184d..be9490437cdd8510a34a289937cc0b27125c0a98 100644
--- a/src/lib-sieve/tst-not.c
+++ b/src/lib-sieve/tst-not.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/lib-sieve/tst-size.c b/src/lib-sieve/tst-size.c
index c4249429db11ab0b2380483012df5f11ae16bbb0..37b2bee228491a63d8c2817f6d0f40393c8ff940 100644
--- a/src/lib-sieve/tst-size.c
+++ b/src/lib-sieve/tst-size.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/lib-sieve/tst-truefalse.c b/src/lib-sieve/tst-truefalse.c
index ef38025039b529c652428b6f063516d175250d4a..17deee35b886c03ecdb136f2c65c51a5e04ac1b7 100644
--- a/src/lib-sieve/tst-truefalse.c
+++ b/src/lib-sieve/tst-truefalse.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-ast.h"
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.c b/src/plugins/lda-sieve/lda-sieve-plugin.c
index f7709299dd4c73454b0197d1a39f29d2dd2345aa..c9edf3dacdbc2dd49f5a829c6d8f088ce06c9f45 100644
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file 
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file 
  */
 
 #include "lib.h"
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.h b/src/plugins/lda-sieve/lda-sieve-plugin.h
index 3c9654731a3ac7aa1d239a5f3673caab1b95373c..55b49f7d479be3735287a2b1973956f7d845ad79 100644
--- a/src/plugins/lda-sieve/lda-sieve-plugin.h
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __LDA_SIEVE_PLUGIN_H
diff --git a/src/sieve-tools/sieve-exec.c b/src/sieve-tools/sieve-exec.c
index 4741016288ca8eddc5adbbdc424a5ffc6944189a..584d17298836ddc3547816c9340506fd9743c4c3 100644
--- a/src/sieve-tools/sieve-exec.c
+++ b/src/sieve-tools/sieve-exec.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/sieve-tools/sieve-test.c b/src/sieve-tools/sieve-test.c
index d335afa330048b2dec3506e8f384aeffcf66c1a9..41faf336444cc9b22a2b068bc42f4d95d26bd17d 100644
--- a/src/sieve-tools/sieve-test.c
+++ b/src/sieve-tools/sieve-test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/sieve-tools/sievec.c b/src/sieve-tools/sievec.c
index a9c03d6a68a1aa88cd1ebb0ca2e5f006cf55cb4c..1c19ec967485925d79a40904e76d11a6fbc611e1 100644
--- a/src/sieve-tools/sievec.c
+++ b/src/sieve-tools/sievec.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/sieve-tools/sieved.c b/src/sieve-tools/sieved.c
index 28eb5c43af7e852a38590daa5af2db1ccf089c37..24c4ad2344a02eb98f3a18f3bdf17cab60c1998f 100644
--- a/src/sieve-tools/sieved.c
+++ b/src/sieve-tools/sieved.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/cmd-test-fail.c b/src/testsuite/cmd-test-fail.c
index 3b1ec240623716a28497a0d15ae7ad5950c0af49..c1185e91f4a09f1a5df5bbf15a368c5c9e8d2708 100644
--- a/src/testsuite/cmd-test-fail.c
+++ b/src/testsuite/cmd-test-fail.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-result-print.c b/src/testsuite/cmd-test-result-print.c
index c05a82db891ac3a48cc81747e3cbb0def699d123..5766190735e209d5d1c88016c6959c764e7a7719 100644
--- a/src/testsuite/cmd-test-result-print.c
+++ b/src/testsuite/cmd-test-result-print.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/cmd-test-set.c b/src/testsuite/cmd-test-set.c
index 8b70d7262ddfb4fa8fb55edf82b5e5abf90ad31b..d6b98819ce33cd2f252c4889a7555dc64b4141c5 100644
--- a/src/testsuite/cmd-test-set.c
+++ b/src/testsuite/cmd-test-set.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/cmd-test.c b/src/testsuite/cmd-test.c
index bcd85eb89bfcf7c23ba4f5fbe2f67315f4690787..15e10bbef99b99efebe02f6d26821760a0b2b28c 100644
--- a/src/testsuite/cmd-test.c
+++ b/src/testsuite/cmd-test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/ext-testsuite.c b/src/testsuite/ext-testsuite.c
index ea4006aa1f1c0087de646dbf668169a831d2aa47..31ac001b27ad80a634d36b60c4deababeb664c9a 100644
--- a/src/testsuite/ext-testsuite.c
+++ b/src/testsuite/ext-testsuite.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* Extension testsuite
diff --git a/src/testsuite/testsuite-arguments.c b/src/testsuite/testsuite-arguments.c
index c86424babcf15d29232ddb23cd5667a8556ce874..ba77785ef8405399092268e3a7cb9f077743963e 100644
--- a/src/testsuite/testsuite-arguments.c
+++ b/src/testsuite/testsuite-arguments.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-arguments.h b/src/testsuite/testsuite-arguments.h
index 5c268f1dd598b542a27bcf73b688b2e5b9f7fcb6..171fa3ec1d168845c296b3a207503d231966b031 100644
--- a/src/testsuite/testsuite-arguments.h
+++ b/src/testsuite/testsuite-arguments.h
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #ifndef __TESTSUITE_ARGUMENTS_H
 #define __TESTSUITE_ARGUMENTS_H
 
diff --git a/src/testsuite/testsuite-common.c b/src/testsuite/testsuite-common.c
index c217c6a9e7bd9d333835db199c5ab3a2d32ee397..f4927db2703a01fe672c7d380ed1d0bc4ccc1c96 100644
--- a/src/testsuite/testsuite-common.c
+++ b/src/testsuite/testsuite-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-common.h b/src/testsuite/testsuite-common.h
index 2c5beb0df38e5470394f97e96d53d6de96ee68f1..2280569ea92eee9eb00d693037250ab0ecc57145 100644
--- a/src/testsuite/testsuite-common.h
+++ b/src/testsuite/testsuite-common.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_COMMON_H
diff --git a/src/testsuite/testsuite-log.c b/src/testsuite/testsuite-log.c
index e36e6e63ac8441d7d16f5af1a8e7a5728b1637ff..a4326dcaa3775196d030e1a7036030ebdf23b6fb 100644
--- a/src/testsuite/testsuite-log.c
+++ b/src/testsuite/testsuite-log.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #include "lib.h"
 #include "array.h"
 
diff --git a/src/testsuite/testsuite-log.h b/src/testsuite/testsuite-log.h
index 3e772b87bebf3b81a1dd753789a4e4c6c2ee0401..a9b1435c6184854119077a63ef9137896f22838b 100644
--- a/src/testsuite/testsuite-log.h
+++ b/src/testsuite/testsuite-log.h
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #ifndef __TESTSUITE_LOG_H
 #define __TESTSUITE_LOG_H
 
diff --git a/src/testsuite/testsuite-objects.c b/src/testsuite/testsuite-objects.c
index 2ecfd62f2f01b4aa30463b1cc7a8b3f227380ffa..52aff5bbc90b7e63beb243fc4fefcc648e9ccb16 100644
--- a/src/testsuite/testsuite-objects.c
+++ b/src/testsuite/testsuite-objects.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-objects.h b/src/testsuite/testsuite-objects.h
index e467e60e916b912828b445354406d1face8a6073..71a7683afc0795c816c264728dfb5ec344bed4ce 100644
--- a/src/testsuite/testsuite-objects.h
+++ b/src/testsuite/testsuite-objects.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_OBJECTS_H
diff --git a/src/testsuite/testsuite-result.c b/src/testsuite/testsuite-result.c
index 16e5d4ffc62380e4201e44cd2103da11880fca7c..d9ba34380b0737c0a21954bf0e2e8e4e472e915c 100644
--- a/src/testsuite/testsuite-result.c
+++ b/src/testsuite/testsuite-result.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/testsuite-result.h b/src/testsuite/testsuite-result.h
index b9b14652350c38bcd0e2e329229c53f61891e8c2..34b1c495c074cd3b66c8310b08a7e9b62b2f268a 100644
--- a/src/testsuite/testsuite-result.h
+++ b/src/testsuite/testsuite-result.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #ifndef __TESTSUITE_RESULT_H
diff --git a/src/testsuite/testsuite-script.c b/src/testsuite/testsuite-script.c
index ae8e8af37d3a7458ffe0117122b898a87e3d33fb..8134e17777ca21dc6f616010660459ca4928ebd7 100644
--- a/src/testsuite/testsuite-script.c
+++ b/src/testsuite/testsuite-script.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #include "lib.h"
 #include "env-util.h"
 
diff --git a/src/testsuite/testsuite-script.h b/src/testsuite/testsuite-script.h
index 20e17e4276ad9afecc4198a44c0a6f57f17be37a..d26781bf5cd92fbd167d7e3e75762362fa227e54 100644
--- a/src/testsuite/testsuite-script.h
+++ b/src/testsuite/testsuite-script.h
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #ifndef __TESTSUITE_SCRIPT_H
 #define __TESTSUITE_SCRIPT_H
 
diff --git a/src/testsuite/testsuite-substitutions.c b/src/testsuite/testsuite-substitutions.c
index 44a6ffd1c98e68119556439de201a5e1ee32303c..991005577f3a8915c731f93f1eceb42b3fbcf211 100644
--- a/src/testsuite/testsuite-substitutions.c
+++ b/src/testsuite/testsuite-substitutions.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #include "lib.h"
 
 #include "sieve.h"
diff --git a/src/testsuite/testsuite-substitutions.h b/src/testsuite/testsuite-substitutions.h
index 9fd0718271ee821a8b9bcccdbb2705243869c9d8..a9e775f0cc6a6d3878e07b6461e525aa2f5ab839 100644
--- a/src/testsuite/testsuite-substitutions.h
+++ b/src/testsuite/testsuite-substitutions.h
@@ -1,3 +1,6 @@
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
+ */
+
 #ifndef __TESTSUITE_SUBSTITUTIONS_H
 #define __TESTSUITE_SUBSTITUTIONS_H
 
diff --git a/src/testsuite/testsuite.c b/src/testsuite/testsuite.c
index 465bbe088d54b7b0c6787c2c76333e7eeef50e6d..66c96bdbfac344fd2214621283bf15363be69add 100644
--- a/src/testsuite/testsuite.c
+++ b/src/testsuite/testsuite.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "lib.h"
diff --git a/src/testsuite/tst-test-error.c b/src/testsuite/tst-test-error.c
index 4611f954965c5ce3d839afdfbbad348107070e20..20fdd8cc7d96fb8bbc24d81ff57f722ea9f505ff 100644
--- a/src/testsuite/tst-test-error.c
+++ b/src/testsuite/tst-test-error.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/tst-test-result-execute.c b/src/testsuite/tst-test-result-execute.c
index bf28203cd912c0dbdde6fac7577e9c06bdb6c255..7129e6da19ca11f98226f4ebef5d41834f9466ab 100644
--- a/src/testsuite/tst-test-result-execute.c
+++ b/src/testsuite/tst-test-result-execute.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/tst-test-result.c b/src/testsuite/tst-test-result.c
index 79fed9b217c99d2331858aa5557449cf8f39f849..05e1274872dd8affd87179e9ce0915784ac0d38a 100644
--- a/src/testsuite/tst-test-result.c
+++ b/src/testsuite/tst-test-result.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 /* FIXME: this file is very similar to tst-test-error.c. Maybe it is best to 
diff --git a/src/testsuite/tst-test-script-compile.c b/src/testsuite/tst-test-script-compile.c
index 8ce4fe7b0e1b83b818273ab00b2d2ebe0eae1b3b..32074cdb6db85ed6ad165036e1d2cf5a142d2e88 100644
--- a/src/testsuite/tst-test-script-compile.c
+++ b/src/testsuite/tst-test-script-compile.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"
diff --git a/src/testsuite/tst-test-script-run.c b/src/testsuite/tst-test-script-run.c
index 2ba17b85518d0e21478c2556d750c1e285c0924d..25a53e9d9bd68c08e8af800543ea5ba492a6e96e 100644
--- a/src/testsuite/tst-test-script-run.c
+++ b/src/testsuite/tst-test-script-run.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
+/* Copyright (c) 2002-2009 Dovecot Sieve authors, see the included COPYING file
  */
 
 #include "sieve-common.h"