diff --git a/library/aes.c b/library/aes.c
index 7e6357c..34ed258 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1,7 +1,8 @@
 /*
  *  FIPS-197 compliant AES implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/arc4.c b/library/arc4.c
index 93ea4dc..5fb9424 100644
--- a/library/arc4.c
+++ b/library/arc4.c
@@ -1,7 +1,8 @@
 /*
  *  An implementation of the ARCFOUR algorithm
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/base64.c b/library/base64.c
index 221c4dd..6b12355 100644
--- a/library/base64.c
+++ b/library/base64.c
@@ -1,7 +1,8 @@
 /*
  *  RFC 1521 base64 encoding/decoding
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/bignum.c b/library/bignum.c
index b66a1ab..4f5bb43 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -1,7 +1,8 @@
 /*
  *  Multi-precision integer library
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/camellia.c b/library/camellia.c
index bc619d8..11c0a23 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -1,7 +1,8 @@
 /*
  *  Camellia implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/certs.c b/library/certs.c
index ccc32db..e521f22 100644
--- a/library/certs.c
+++ b/library/certs.c
@@ -1,7 +1,8 @@
 /*
  *  X.509 test certificates
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/debug.c b/library/debug.c
index b3855db..f737222 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -1,7 +1,8 @@
 /*
  *  Debugging routines
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/des.c b/library/des.c
index 7798821..25091aa 100644
--- a/library/des.c
+++ b/library/des.c
@@ -1,7 +1,8 @@
 /*
  *  FIPS-46-3 compliant Triple-DES implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/dhm.c b/library/dhm.c
index 904b592..13cd6b2 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -1,7 +1,8 @@
 /*
  *  Diffie-Hellman-Merkle key exchange
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/havege.c b/library/havege.c
index 3d96d4d..4ebc939 100644
--- a/library/havege.c
+++ b/library/havege.c
@@ -1,7 +1,8 @@
 /*
  *  HAVEGE: HArdware Volatile Entropy Gathering and Expansion
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/md2.c b/library/md2.c
index 9186980..1519de5 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -1,7 +1,8 @@
 /*
  *  RFC 1115/1319 compliant MD2 implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/md4.c b/library/md4.c
index f3d80d0..03637f1 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -1,7 +1,8 @@
 /*
  *  RFC 1186/1320 compliant MD4 implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/md5.c b/library/md5.c
index 7560371..d540e68 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -1,7 +1,8 @@
 /*
  *  RFC 1321 compliant MD5 implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/net.c b/library/net.c
index 67b52a7..cda1662 100644
--- a/library/net.c
+++ b/library/net.c
@@ -1,7 +1,8 @@
 /*
  *  TCP networking functions
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/padlock.c b/library/padlock.c
index 76f1d07..cedfd9c 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -1,7 +1,8 @@
 /*
  *  VIA PadLock support functions
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/rsa.c b/library/rsa.c
index a51d4f7..1b0a96b 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1,7 +1,8 @@
 /*
  *  The RSA public-key cryptosystem
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/sha1.c b/library/sha1.c
index 0ebdc1e..9d719b8 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -1,7 +1,8 @@
 /*
  *  FIPS-180-1 compliant SHA-1 implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/sha2.c b/library/sha2.c
index f82a7ae..3f6f0db 100644
--- a/library/sha2.c
+++ b/library/sha2.c
@@ -1,7 +1,8 @@
 /*
  *  FIPS-180-2 compliant SHA-256 implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/sha4.c b/library/sha4.c
index c0cbd3d..39084cb 100644
--- a/library/sha4.c
+++ b/library/sha4.c
@@ -1,7 +1,8 @@
 /*
  *  FIPS-180-2 compliant SHA-384/512 implementation
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/ssl_cli.c b/library/ssl_cli.c
index 1b23d6b..72cfcf3 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1,7 +1,8 @@
 /*
  *  SSLv3/TLSv1 client-side functions
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/ssl_srv.c b/library/ssl_srv.c
index 81f2be2..cab38f5 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1,7 +1,8 @@
 /*
  *  SSLv3/TLSv1 server-side functions
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/ssl_tls.c b/library/ssl_tls.c
index 3414c78..fb46d48 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1,7 +1,8 @@
 /*
  *  SSLv3/TLSv1 shared functions
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/timing.c b/library/timing.c
index 7bed3f6..3877c04 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -1,7 +1,8 @@
 /*
  *  Portable interface to the CPU cycle counter
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/version.c b/library/version.c
index a43e488..e7369eb 100644
--- a/library/version.c
+++ b/library/version.c
@@ -1,7 +1,8 @@
 /*
  *  Version information
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/x509parse.c b/library/x509parse.c
index c316c03..1403261 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -1,7 +1,8 @@
 /*
  *  X.509 certificate and private key decoding
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: 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/library/xtea.c b/library/xtea.c
index b47a8ed..4f5665b 100644
--- a/library/xtea.c
+++ b/library/xtea.c
@@ -1,7 +1,8 @@
 /*
  *  An 32-bit implementation of the XTEA algorithm
  *
- *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify