diff --git a/include/polarssl/aes.h b/include/polarssl/aes.h
index 8268390..3b77761 100644
--- a/include/polarssl/aes.h
+++ b/include/polarssl/aes.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..1608824 100644
--- a/include/polarssl/arc4.h
+++ b/include/polarssl/arc4.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..e5988bc 100644
--- a/include/polarssl/base64.h
+++ b/include/polarssl/base64.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..6a1e924 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..6607ceb 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/certs.h b/include/polarssl/certs.h
index b982d7e..4a42146 100644
--- a/include/polarssl/certs.h
+++ b/include/polarssl/certs.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..16b9842 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..d7af4aa 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..c646058 100644
--- a/include/polarssl/des.h
+++ b/include/polarssl/des.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..d9021f8 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..3d626b4 100644
--- a/include/polarssl/havege.h
+++ b/include/polarssl/havege.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..5003236 100644
--- a/include/polarssl/md2.h
+++ b/include/polarssl/md2.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..743b76f 100644
--- a/include/polarssl/md4.h
+++ b/include/polarssl/md4.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..e924e5d 100644
--- a/include/polarssl/md5.h
+++ b/include/polarssl/md5.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..a95892e 100644
--- a/include/polarssl/net.h
+++ b/include/polarssl/net.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..ed47ad8 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..99c9787 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..08cfa2c 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..f8d6c5f 100644
--- a/include/polarssl/sha1.h
+++ b/include/polarssl/sha1.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..bb7db3e 100644
--- a/include/polarssl/sha2.h
+++ b/include/polarssl/sha2.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..f78dc03 100644
--- a/include/polarssl/sha4.h
+++ b/include/polarssl/sha4.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..b2dfa32 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..dc09287 100644
--- a/include/polarssl/timing.h
+++ b/include/polarssl/timing.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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..cd3336c 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/aes.c b/library/aes.c
index bf7b337..9af8b71 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/arc4.c b/library/arc4.c
index b87053e..7c37f4c 100644
--- a/library/arc4.c
+++ b/library/arc4.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/base64.c b/library/base64.c
index 6a6c3ae..34d21bc 100644
--- a/library/base64.c
+++ b/library/base64.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/bignum.c b/library/bignum.c
index fa9f1f1..5a47fbd 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/certs.c b/library/certs.c
index 5b66c86..ebca842 100644
--- a/library/certs.c
+++ b/library/certs.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/debug.c b/library/debug.c
index 58bb816..abd5e71 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/des.c b/library/des.c
index d2f7662..9f3b4f1 100644
--- a/library/des.c
+++ b/library/des.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/dhm.c b/library/dhm.c
index 04d1e9f..f48841f 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/havege.c b/library/havege.c
index 610f9c5..e657c0d 100644
--- a/library/havege.c
+++ b/library/havege.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/md2.c b/library/md2.c
index 3a0d1f5..eba880e 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/md4.c b/library/md4.c
index 564a7f9..6310abc 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/md5.c b/library/md5.c
index 5ab3383..1a22e10 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/net.c b/library/net.c
index e3b1738..b558e41 100644
--- a/library/net.c
+++ b/library/net.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/padlock.c b/library/padlock.c
index 4c30ddd..50526e3 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/rsa.c b/library/rsa.c
index 6fca27d..c6c0e99 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/sha1.c b/library/sha1.c
index 7f8ec63..6c71eda 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/sha2.c b/library/sha2.c
index 8f920ce..49446f5 100644
--- a/library/sha2.c
+++ b/library/sha2.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/sha4.c b/library/sha4.c
index 699cca7..78637d4 100644
--- a/library/sha4.c
+++ b/library/sha4.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/ssl_cli.c b/library/ssl_cli.c
index 5802fdc..ef7bbd6 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/ssl_srv.c b/library/ssl_srv.c
index aec33a2..8113dee 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/ssl_tls.c b/library/ssl_tls.c
index 7335513..d157a37 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/timing.c b/library/timing.c
index 0b62b10..c2d1f23 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/library/x509parse.c b/library/x509parse.c
index 3013e9b..104bc32 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c
index d5305c1..30de39e 100644
--- a/programs/aes/aescrypt2.c
+++ b/programs/aes/aescrypt2.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/hash/hello.c b/programs/hash/hello.c
index 897cccc..521ff57 100644
--- a/programs/hash/hello.c
+++ b/programs/hash/hello.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/hash/md5sum.c b/programs/hash/md5sum.c
index 5ae7a85..cf14fd1 100644
--- a/programs/hash/md5sum.c
+++ b/programs/hash/md5sum.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/hash/sha1sum.c b/programs/hash/sha1sum.c
index 3a4fdfb..64573d0 100644
--- a/programs/hash/sha1sum.c
+++ b/programs/hash/sha1sum.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/hash/sha2sum.c b/programs/hash/sha2sum.c
index 0ef84f2..545bede 100644
--- a/programs/hash/sha2sum.c
+++ b/programs/hash/sha2sum.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index 599e806..5ccb236 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c
index cc02ea6..b0cfce0 100644
--- a/programs/pkey/dh_genprime.c
+++ b/programs/pkey/dh_genprime.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index abea373..48e6da2 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c
index f5b4524..f6de609 100644
--- a/programs/pkey/mpi_demo.c
+++ b/programs/pkey/mpi_demo.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c
index d043321..56aef7e 100644
--- a/programs/pkey/rsa_genkey.c
+++ b/programs/pkey/rsa_genkey.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c
index 6ccb001..ce2e517 100644
--- a/programs/pkey/rsa_sign.c
+++ b/programs/pkey/rsa_sign.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c
index ee26694..4093762 100644
--- a/programs/pkey/rsa_verify.c
+++ b/programs/pkey/rsa_verify.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index 4366853..209e37e 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index c869629..a5d26d8 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index e0af1b0..ef66737 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/test/benchmark.c b/programs/test/benchmark.c
index 922c5ec..9434ec5 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/test/selftest.c b/programs/test/selftest.c
index ae75430..71a2014 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/test/ssl_test.c b/programs/test/ssl_test.c
index f12c2e9..f776bce 100644
--- a/programs/test/ssl_test.c
+++ b/programs/test/ssl_test.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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/programs/x509/cert_app.c b/programs/x509/cert_app.c
index 1df5198..b3199c4 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -4,8 +4,6 @@
  *  Copyright (C) 2006-2009, 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