diff --git a/include/polarssl/aes.h b/include/polarssl/aes.h
index 8ecba32..83fe8f2 100644
--- a/include/polarssl/aes.h
+++ b/include/polarssl/aes.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/arc4.h b/include/polarssl/arc4.h
index acbd84a..0ff7511 100644
--- a/include/polarssl/arc4.h
+++ b/include/polarssl/arc4.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/base64.h b/include/polarssl/base64.h
index 61754d1..a439d55 100644
--- a/include/polarssl/base64.h
+++ b/include/polarssl/base64.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h
index 8b23ba9..e6abd59 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index 2b65a91..d4ea7bd 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/camellia.h b/include/polarssl/camellia.h
index a555f09..9f2e103 100644
--- a/include/polarssl/camellia.h
+++ b/include/polarssl/camellia.h
@@ -1,7 +1,7 @@
 /**
  * \file camellia.h
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/certs.h b/include/polarssl/certs.h
index 4b61ee1..9d8c5f8 100644
--- a/include/polarssl/certs.h
+++ b/include/polarssl/certs.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 2b0bf1a..95d23cf 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 9101aab..7aa3d7c 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/des.h b/include/polarssl/des.h
index 17c3c8b..2a26727 100644
--- a/include/polarssl/des.h
+++ b/include/polarssl/des.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/dhm.h b/include/polarssl/dhm.h
index ca59c9a..219989e 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/havege.h b/include/polarssl/havege.h
index 29c20ab..1f6daa2 100644
--- a/include/polarssl/havege.h
+++ b/include/polarssl/havege.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/md2.h b/include/polarssl/md2.h
index fcb804f..c243304 100644
--- a/include/polarssl/md2.h
+++ b/include/polarssl/md2.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/md4.h b/include/polarssl/md4.h
index 2bb535b..17b9aac 100644
--- a/include/polarssl/md4.h
+++ b/include/polarssl/md4.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/md5.h b/include/polarssl/md5.h
index 19acc6b..baad48f 100644
--- a/include/polarssl/md5.h
+++ b/include/polarssl/md5.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/net.h b/include/polarssl/net.h
index aa6f938..f135f91 100644
--- a/include/polarssl/net.h
+++ b/include/polarssl/net.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/openssl.h b/include/polarssl/openssl.h
index 11696a8..6e03b87 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/padlock.h b/include/polarssl/padlock.h
index 1196c03..6f7a453 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/rsa.h b/include/polarssl/rsa.h
index f02df5a..73dce61 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/sha1.h b/include/polarssl/sha1.h
index 2c4399c..481aa87 100644
--- a/include/polarssl/sha1.h
+++ b/include/polarssl/sha1.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/sha2.h b/include/polarssl/sha2.h
index abfab56..c225ce1 100644
--- a/include/polarssl/sha2.h
+++ b/include/polarssl/sha2.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/sha4.h b/include/polarssl/sha4.h
index ab47dce..a7f8443 100644
--- a/include/polarssl/sha4.h
+++ b/include/polarssl/sha4.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 36c23c0..f4d7d1a 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/timing.h b/include/polarssl/timing.h
index 5494f21..1bc7351 100644
--- a/include/polarssl/timing.h
+++ b/include/polarssl/timing.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index 2492655..832752d 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -3,7 +3,7 @@
  *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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
diff --git a/include/polarssl/xtea.h b/include/polarssl/xtea.h
index 7a6b558..770ecc2 100644
--- a/include/polarssl/xtea.h
+++ b/include/polarssl/xtea.h
@@ -1,7 +1,7 @@
 /**
  * \file xtea.h
  *
- *  Copyright (C) 2009       Paul Bakker
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
  *  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