diff --git a/include/polarssl/aes.h b/include/polarssl/aes.h
index 8268390..b8a358b 100644
--- a/include/polarssl/aes.h
+++ b/include/polarssl/aes.h
@@ -1,11 +1,9 @@
 /**
  * \file aes.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/arc4.h b/include/polarssl/arc4.h
index 14abe39..e903cca 100644
--- a/include/polarssl/arc4.h
+++ b/include/polarssl/arc4.h
@@ -1,11 +1,9 @@
 /**
  * \file arc4.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/base64.h b/include/polarssl/base64.h
index 6144184..bb1c236 100644
--- a/include/polarssl/base64.h
+++ b/include/polarssl/base64.h
@@ -1,11 +1,9 @@
 /**
  * \file base64.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h
index f413512..2f8a75d 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -1,11 +1,9 @@
 /**
  * \file bignum.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index 3eca5cc..4986b51 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -1,11 +1,9 @@
 /**
  * \file bn_mul.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/camellia.h b/include/polarssl/camellia.h
index ed05990..a989cf3 100644
--- a/include/polarssl/camellia.h
+++ b/include/polarssl/camellia.h
@@ -1,7 +1,7 @@
 /**
  * \file camellia.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/include/polarssl/certs.h b/include/polarssl/certs.h
index b982d7e..6760cdb 100644
--- a/include/polarssl/certs.h
+++ b/include/polarssl/certs.h
@@ -1,11 +1,9 @@
 /**
  * \file certs.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index c09bca6..64ec89e 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -1,11 +1,9 @@
 /**
  * \file config.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 9bae627..aae0ecf 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -1,11 +1,9 @@
 /**
  * \file debug.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/des.h b/include/polarssl/des.h
index 04fdf67..172877e 100644
--- a/include/polarssl/des.h
+++ b/include/polarssl/des.h
@@ -1,11 +1,9 @@
 /**
  * \file des.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/dhm.h b/include/polarssl/dhm.h
index b6f3348..7032242 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -1,11 +1,9 @@
 /**
  * \file dhm.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/havege.h b/include/polarssl/havege.h
index ea355b9..08fdd65 100644
--- a/include/polarssl/havege.h
+++ b/include/polarssl/havege.h
@@ -1,11 +1,9 @@
 /**
  * \file havege.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/md2.h b/include/polarssl/md2.h
index 71040eb..15b5882 100644
--- a/include/polarssl/md2.h
+++ b/include/polarssl/md2.h
@@ -1,11 +1,9 @@
 /**
  * \file md2.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/md4.h b/include/polarssl/md4.h
index 24b90ec..5ceb2c6 100644
--- a/include/polarssl/md4.h
+++ b/include/polarssl/md4.h
@@ -1,11 +1,9 @@
 /**
  * \file md4.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/md5.h b/include/polarssl/md5.h
index ac28a0b..aaf9b58 100644
--- a/include/polarssl/md5.h
+++ b/include/polarssl/md5.h
@@ -1,11 +1,9 @@
 /**
  * \file md5.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/net.h b/include/polarssl/net.h
index 8a5fc4e..80ee8bf 100644
--- a/include/polarssl/net.h
+++ b/include/polarssl/net.h
@@ -1,11 +1,9 @@
 /**
  * \file net.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/openssl.h b/include/polarssl/openssl.h
index 6950384..3f0ea36 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -1,11 +1,9 @@
 /**
  * \file openssl.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/padlock.h b/include/polarssl/padlock.h
index cccc55d..8fb4e5c 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -1,11 +1,9 @@
 /**
  * \file padlock.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/rsa.h b/include/polarssl/rsa.h
index e7ee76a..4219cbe 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -1,11 +1,9 @@
 /**
  * \file rsa.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/sha1.h b/include/polarssl/sha1.h
index 060f720..6c7a41f 100644
--- a/include/polarssl/sha1.h
+++ b/include/polarssl/sha1.h
@@ -1,11 +1,9 @@
 /**
  * \file sha1.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/sha2.h b/include/polarssl/sha2.h
index d9f3855..bc4713b 100644
--- a/include/polarssl/sha2.h
+++ b/include/polarssl/sha2.h
@@ -1,11 +1,9 @@
 /**
  * \file sha2.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/sha4.h b/include/polarssl/sha4.h
index eb35f04..c508964 100644
--- a/include/polarssl/sha4.h
+++ b/include/polarssl/sha4.h
@@ -1,11 +1,9 @@
 /**
  * \file sha4.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 6b2ee3c..649b547 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -1,11 +1,9 @@
 /**
  * \file ssl.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/timing.h b/include/polarssl/timing.h
index ef5066e..e0edcc5 100644
--- a/include/polarssl/timing.h
+++ b/include/polarssl/timing.h
@@ -1,11 +1,9 @@
 /**
  * \file timing.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index 9e1d5d6..31b1122 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -1,11 +1,9 @@
 /**
  * \file x509.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/xtea.h b/include/polarssl/xtea.h
index 21f0edf..c9c80c9 100644
--- a/include/polarssl/xtea.h
+++ b/include/polarssl/xtea.h
@@ -1,7 +1,7 @@
 /**
  * \file xtea.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify