diff --git a/src/libopensc/card-atrust-acos.c b/src/libopensc/card-atrust-acos.c
index 639d5cdb..6ee0554e 100644
--- a/src/libopensc/card-atrust-acos.c
+++ b/src/libopensc/card-atrust-acos.c
@@ -2,7 +2,7 @@
  * atrust-acos.c: Support for A-Trust ACOS based cards
  *
  * Copyright (C) 2005  Franz Brandl <brandl@a-trust.at> based on work from
- *                     Jörn Zukowski <zukowski@trustcenter.de> and 
+ *                     Jörn Zukowski <zukowski@trustcenter.de> and 
  *                     Nils Larsch   <larsch@trustcenter.de>, TrustCenter AG
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/libopensc/card-cardos.c b/src/libopensc/card-cardos.c
index 8591a829..018bb93e 100644
--- a/src/libopensc/card-cardos.c
+++ b/src/libopensc/card-cardos.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2005  Nils Larsch <nils@larsch.net>
  * Copyright (C) 2002  Andreas Jellinghaus <aj@dungeon.inka.de>
- * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libopensc/card-default.c b/src/libopensc/card-default.c
index 0b699b79..1c007305 100644
--- a/src/libopensc/card-default.c
+++ b/src/libopensc/card-default.c
@@ -1,7 +1,7 @@
 /*
  * card-default.c: Support for cards with no driver
  *
- * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libopensc/card-emv.c b/src/libopensc/card-emv.c
index b3d2417b..f805d2cc 100644
--- a/src/libopensc/card-emv.c
+++ b/src/libopensc/card-emv.c
@@ -1,7 +1,7 @@
 /*
  * card-emv.c: Functions specified by the EMV standard
  *
- * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libopensc/card-flex.c b/src/libopensc/card-flex.c
index 295a5a26..10e7fd85 100644
--- a/src/libopensc/card-flex.c
+++ b/src/libopensc/card-flex.c
@@ -1,7 +1,7 @@
 /*
  * card-flex.c: Support for Schlumberger cards
  *
- * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libopensc/card-incrypto34.c b/src/libopensc/card-incrypto34.c
index 45523f92..59fca2be 100644
--- a/src/libopensc/card-incrypto34.c
+++ b/src/libopensc/card-incrypto34.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2005  ST Incard srl, Giuseppe Amato <giuseppe dot amato at st dot com>
  * Copyright (C) 2002  Andreas Jellinghaus <aj@dungeon.inka.de>
- * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libopensc/card-mcrd.c b/src/libopensc/card-mcrd.c
index a13c8b57..036c34c2 100644
--- a/src/libopensc/card-mcrd.c
+++ b/src/libopensc/card-mcrd.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2004  Martin Paljak <martin@paljak.pri.ee>
  * Copyright (C) 2004  Priit Randla <priit.randla@eyp.ee>
  * Copyright (C) 2003  Marie Fischer <marie@vtl.ee> 
- * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
  * Copyright (C) 2002  g10 Code GmbH
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/libopensc/card-miocos.c b/src/libopensc/card-miocos.c
index 9114e85a..567815d4 100644
--- a/src/libopensc/card-miocos.c
+++ b/src/libopensc/card-miocos.c
@@ -1,7 +1,7 @@
 /*
  * card-miocos.c: Support for PKI cards by Miotec
  *
- * Copyright (C) 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libopensc/card-oberthur.c b/src/libopensc/card-oberthur.c
index e70faa3c..cc4f3a52 100644
--- a/src/libopensc/card-oberthur.c
+++ b/src/libopensc/card-oberthur.c
@@ -2,7 +2,7 @@
  * card-oberthur.c: Support for Oberthur smart cards 
  *		CosmopolIC  v5; 
  *
- * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  * Copyright (C) 2003  Viktor Tarasov <vtarasov@idealx.com>, idealx <www.idealx.com>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
index 7a8f67d6..211ae295 100644
--- a/src/libopensc/card-piv.c
+++ b/src/libopensc/card-piv.c
@@ -2,7 +2,7 @@
  * card-piv.c: Support for PIV-II from NIST SP800-73 
  * card-default.c: Support for cards with no driver
  *
- * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  * Copyright (C) 2005, Douglas E. Engert <deengert@anl.gov>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/libopensc/card-setcos.c b/src/libopensc/card-setcos.c
index ab783e05..9b163135 100644
--- a/src/libopensc/card-setcos.c
+++ b/src/libopensc/card-setcos.c
@@ -1,7 +1,7 @@
 /*
  * card-setcos.c: Support for PKI cards by Setec
  *
- * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  * Copyright (C) 2005  Antti Tapaninen <aet@cc.hut.fi>
  * Copyright (C) 2005  Zetes
  *
diff --git a/src/libopensc/card-starcos.c b/src/libopensc/card-starcos.c
index e41936e8..d87d6996 100644
--- a/src/libopensc/card-starcos.c
+++ b/src/libopensc/card-starcos.c
@@ -1,7 +1,7 @@
 /*
  * card-starcos.c: Support for STARCOS SPK 2.3 cards
  *
- * Copyright (C) 2003  Jörn Zukowski <zukowski@trustcenter.de> and 
+ * Copyright (C) 2003  Jörn Zukowski <zukowski@trustcenter.de> and 
  *                     Nils Larsch   <larsch@trustcenter.de>, TrustCenter AG
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/libopensc/card-tcos.c b/src/libopensc/card-tcos.c
index 42e81442..db0cc372 100644
--- a/src/libopensc/card-tcos.c
+++ b/src/libopensc/card-tcos.c
@@ -1,7 +1,7 @@
 /*
  * card-tcos.c: Support for TCOS 2.0 cards
  *
- * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
  * Copyright (C) 2002  g10 Code GmbH
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/libopensc/card.c b/src/libopensc/card.c
index 66434b48..c6540eb2 100644
--- a/src/libopensc/card.c
+++ b/src/libopensc/card.c
@@ -1,7 +1,7 @@
 /*
  * card.c: General smart card functions
  *
- * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2001, 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libopensc/ctx.c b/src/libopensc/ctx.c
index 98dde067..c4bbab83 100644
--- a/src/libopensc/ctx.c
+++ b/src/libopensc/ctx.c
@@ -1,7 +1,7 @@
 /*
  * ctx.c: Context related functions
  *
- * Copyright (C) 2002  Juha Yrjölä <juha.yrjola@iki.fi>
+ * Copyright (C) 2002  Juha Yrjölä <juha.yrjola@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public