diff --git a/library/aes.c b/library/aes.c
index 8de06fb..003325d 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -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/library/arc4.c b/library/arc4.c
index b31849d..943e330 100644
--- a/library/arc4.c
+++ b/library/arc4.c
@@ -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/library/base64.c b/library/base64.c
index d08c50c..4b7e1ab 100644
--- a/library/base64.c
+++ b/library/base64.c
@@ -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/library/bignum.c b/library/bignum.c
index 3e3165b..97d4d12 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -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/library/camellia.c b/library/camellia.c
index 80444c2..571d6a4 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -1,7 +1,7 @@
 /*
  *  Camellia implementation
  *
- *  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/library/certs.c b/library/certs.c
index c4328fb..385a5b9 100644
--- a/library/certs.c
+++ b/library/certs.c
@@ -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/library/debug.c b/library/debug.c
index 4fd942e..4648625 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -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/library/des.c b/library/des.c
index 65ab436..89849be 100644
--- a/library/des.c
+++ b/library/des.c
@@ -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/library/dhm.c b/library/dhm.c
index e92f325..6879969 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -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/library/havege.c b/library/havege.c
index 2d69a48..b619f5d 100644
--- a/library/havege.c
+++ b/library/havege.c
@@ -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/library/md2.c b/library/md2.c
index 36695ed..7bd5769 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -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/library/md4.c b/library/md4.c
index 7b91948..acf00cb 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -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/library/md5.c b/library/md5.c
index 3fb5214..a964617 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -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/library/net.c b/library/net.c
index 7486417..d243fb3 100644
--- a/library/net.c
+++ b/library/net.c
@@ -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/library/padlock.c b/library/padlock.c
index 35c5b95..f14472f 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -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/library/rsa.c b/library/rsa.c
index 211de4e..f1445a5 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -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/library/sha1.c b/library/sha1.c
index 1bc058f..fbb3a87 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -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/library/sha2.c b/library/sha2.c
index 278a609..da558d7 100644
--- a/library/sha2.c
+++ b/library/sha2.c
@@ -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/library/sha4.c b/library/sha4.c
index 6c5fe37..62d6837 100644
--- a/library/sha4.c
+++ b/library/sha4.c
@@ -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/library/ssl_cli.c b/library/ssl_cli.c
index df21ecb..fe663e4 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -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/library/ssl_srv.c b/library/ssl_srv.c
index a8b9022..c64c197 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -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/library/ssl_tls.c b/library/ssl_tls.c
index 29fcffd..93d5b56 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -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/library/timing.c b/library/timing.c
index d1a2f81..107b639 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -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/library/x509parse.c b/library/x509parse.c
index a90023b..8029bc5 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -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/library/xtea.c b/library/xtea.c
index c775c1e..9fc4acd 100644
--- a/library/xtea.c
+++ b/library/xtea.c
@@ -1,7 +1,7 @@
 /*
  *  An 32-bit implementation of the XTEA algorithm
  *
- *  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