diff --git a/include/polarssl/aes.h b/include/polarssl/aes.h
index b8a358b..9cb4a92 100644
--- a/include/polarssl/aes.h
+++ b/include/polarssl/aes.h
@@ -1,7 +1,8 @@
 /**
  * \file aes.h
  *
- *  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/include/polarssl/arc4.h b/include/polarssl/arc4.h
index e903cca..d9077de 100644
--- a/include/polarssl/arc4.h
+++ b/include/polarssl/arc4.h
@@ -1,7 +1,8 @@
 /**
  * \file arc4.h
  *
- *  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/include/polarssl/base64.h b/include/polarssl/base64.h
index bb1c236..67a52f1 100644
--- a/include/polarssl/base64.h
+++ b/include/polarssl/base64.h
@@ -1,7 +1,8 @@
 /**
  * \file base64.h
  *
- *  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/include/polarssl/bignum.h b/include/polarssl/bignum.h
index 2f8a75d..417f560 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -1,7 +1,8 @@
 /**
  * \file bignum.h
  *
- *  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/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index 4986b51..2470fc7 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -1,7 +1,8 @@
 /**
  * \file bn_mul.h
  *
- *  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/include/polarssl/camellia.h b/include/polarssl/camellia.h
index a989cf3..13c8f42 100644
--- a/include/polarssl/camellia.h
+++ b/include/polarssl/camellia.h
@@ -1,7 +1,8 @@
 /**
  * \file camellia.h
  *
- *  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/include/polarssl/certs.h b/include/polarssl/certs.h
index 6760cdb..de49dd8 100644
--- a/include/polarssl/certs.h
+++ b/include/polarssl/certs.h
@@ -1,7 +1,8 @@
 /**
  * \file certs.h
  *
- *  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/include/polarssl/config.h b/include/polarssl/config.h
index ca87828..aeee124 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -1,7 +1,8 @@
 /**
  * \file config.h
  *
- *  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/include/polarssl/debug.h b/include/polarssl/debug.h
index aae0ecf..abc3e71 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -1,7 +1,8 @@
 /**
  * \file debug.h
  *
- *  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/include/polarssl/des.h b/include/polarssl/des.h
index 172877e..9722ec0 100644
--- a/include/polarssl/des.h
+++ b/include/polarssl/des.h
@@ -1,7 +1,8 @@
 /**
  * \file des.h
  *
- *  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/include/polarssl/dhm.h b/include/polarssl/dhm.h
index e80c45e..7d5f1b8 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -1,7 +1,8 @@
 /**
  * \file dhm.h
  *
- *  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/include/polarssl/havege.h b/include/polarssl/havege.h
index 08fdd65..bcd9f85 100644
--- a/include/polarssl/havege.h
+++ b/include/polarssl/havege.h
@@ -1,7 +1,8 @@
 /**
  * \file havege.h
  *
- *  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/include/polarssl/md2.h b/include/polarssl/md2.h
index 15b5882..b2c0e3b 100644
--- a/include/polarssl/md2.h
+++ b/include/polarssl/md2.h
@@ -1,7 +1,8 @@
 /**
  * \file md2.h
  *
- *  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/include/polarssl/md4.h b/include/polarssl/md4.h
index 5ceb2c6..a4b4dfc 100644
--- a/include/polarssl/md4.h
+++ b/include/polarssl/md4.h
@@ -1,7 +1,8 @@
 /**
  * \file md4.h
  *
- *  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/include/polarssl/md5.h b/include/polarssl/md5.h
index aaf9b58..891828e 100644
--- a/include/polarssl/md5.h
+++ b/include/polarssl/md5.h
@@ -1,7 +1,8 @@
 /**
  * \file md5.h
  *
- *  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/include/polarssl/net.h b/include/polarssl/net.h
index 80ee8bf..9e52e57 100644
--- a/include/polarssl/net.h
+++ b/include/polarssl/net.h
@@ -1,7 +1,8 @@
 /**
  * \file net.h
  *
- *  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/include/polarssl/openssl.h b/include/polarssl/openssl.h
index 3f0ea36..c8238cb 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -1,7 +1,8 @@
 /**
  * \file openssl.h
  *
- *  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/include/polarssl/padlock.h b/include/polarssl/padlock.h
index 8fb4e5c..e8faf7c 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -1,7 +1,8 @@
 /**
  * \file padlock.h
  *
- *  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/include/polarssl/rsa.h b/include/polarssl/rsa.h
index 9fb417a..d17d388 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -1,7 +1,8 @@
 /**
  * \file rsa.h
  *
- *  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/include/polarssl/sha1.h b/include/polarssl/sha1.h
index 6c7a41f..4043423 100644
--- a/include/polarssl/sha1.h
+++ b/include/polarssl/sha1.h
@@ -1,7 +1,8 @@
 /**
  * \file sha1.h
  *
- *  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/include/polarssl/sha2.h b/include/polarssl/sha2.h
index bc4713b..b49afaa 100644
--- a/include/polarssl/sha2.h
+++ b/include/polarssl/sha2.h
@@ -1,7 +1,8 @@
 /**
  * \file sha2.h
  *
- *  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/include/polarssl/sha4.h b/include/polarssl/sha4.h
index c508964..30718ed 100644
--- a/include/polarssl/sha4.h
+++ b/include/polarssl/sha4.h
@@ -1,7 +1,8 @@
 /**
  * \file sha4.h
  *
- *  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/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 9bcc073..84bf295 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -1,7 +1,8 @@
 /**
  * \file ssl.h
  *
- *  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/include/polarssl/timing.h b/include/polarssl/timing.h
index e0edcc5..3a88815 100644
--- a/include/polarssl/timing.h
+++ b/include/polarssl/timing.h
@@ -1,7 +1,8 @@
 /**
  * \file timing.h
  *
- *  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/include/polarssl/version.h b/include/polarssl/version.h
index 88cb609..0d227b4 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -1,7 +1,8 @@
 /**
  * \file version.h
  *
- *  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/include/polarssl/x509.h b/include/polarssl/x509.h
index 31b1122..c5bd566 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -1,7 +1,8 @@
 /**
  * \file x509.h
  *
- *  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/include/polarssl/xtea.h b/include/polarssl/xtea.h
index c9c80c9..d1635fc 100644
--- a/include/polarssl/xtea.h
+++ b/include/polarssl/xtea.h
@@ -1,7 +1,8 @@
 /**
  * \file xtea.h
  *
- *  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