diff --git a/AUTHORS b/AUTHORS
index 42f2686ad..701436cbb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -73,7 +73,7 @@ Backends:
  st400:         Ingo Wilken
  tamarack:      Rogier Wolff
  teco1:         Frank Zago (*)
- teco2:         Frank Zago (*), Gerard Klaver (*)
+ teco2:         Frank Zago, Gerard Klaver (*)
  teco3:         Frank Zago (*)
  test:          Henning Meier-Geinitz (*)
  u12:           Gerhard Jaeger (*)
@@ -138,7 +138,7 @@ Eddy De Greef <eddy_de_greef at tiscali dot be>
 Eugene S. Weiss <yossarian@users.sourceforge.net>
 Feico W. Dillema <dillema@acm.org>
 Franck Schneider <schnefra@hol.fr>
-Frank Zago <fzago at austin dot rr dot com>
+Frank Zago <sane at zago dot net>
 Frederik Ramm <frederik@remote.org>
 Gerard Klaver <gerard at gkall dot hobby dot nl>
 Gerhard Jaeger <gerhard@gjaeger.de>
diff --git a/backend/leo.c b/backend/leo.c
index 17dcb57de..2f3b8edb1 100644
--- a/backend/leo.c
+++ b/backend/leo.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002-2003 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002-2003 Frank Zago (sane at zago dot net)
    
    This file is part of the SANE package.
    
diff --git a/backend/leo.h b/backend/leo.h
index a27ba3ee3..1ce60ece5 100644
--- a/backend/leo.h
+++ b/backend/leo.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
 
    This file is part of the SANE package.
 
diff --git a/backend/matsushita.c b/backend/matsushita.c
index f786291d8..091858e8f 100644
--- a/backend/matsushita.c
+++ b/backend/matsushita.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002, 2004 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002, 2004 Frank Zago (sane at zago dot net)
    Copyright (C) 2002 Other SANE contributors
    
    This file is part of the SANE package.
diff --git a/backend/matsushita.h b/backend/matsushita.h
index 127e2b57c..b8f93bd58 100644
--- a/backend/matsushita.h
+++ b/backend/matsushita.h
@@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
 
    This file is part of the SANE package.
 
diff --git a/backend/sceptre.c b/backend/sceptre.c
index ab7257b3a..bdfd5b141 100644
--- a/backend/sceptre.c
+++ b/backend/sceptre.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
    Copyright (C) 2002 Other SANE contributors
    
    This file is part of the SANE package.
diff --git a/backend/sceptre.h b/backend/sceptre.h
index 3174c0ea7..8bc41029d 100644
--- a/backend/sceptre.h
+++ b/backend/sceptre.h
@@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
 
    This file is part of the SANE package.
 
diff --git a/backend/teco1.c b/backend/teco1.c
index 6b66ba59d..5fd074caa 100644
--- a/backend/teco1.c
+++ b/backend/teco1.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
    
    This file is part of the SANE package.
    
diff --git a/backend/teco1.h b/backend/teco1.h
index b13494b14..8fe0cd641 100644
--- a/backend/teco1.h
+++ b/backend/teco1.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
 
    This file is part of the SANE package.
 
diff --git a/backend/teco2.c b/backend/teco2.c
index 837d034e0..816c502b7 100644
--- a/backend/teco2.c
+++ b/backend/teco2.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002-2003 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002-2003 Frank Zago (sane at zago dot net)
    Copyright (C) 2003-2005 Gerard Klaver (gerard at gkall dot hobby dot nl)
 
    This file is part of the SANE package.
diff --git a/backend/teco2.h b/backend/teco2.h
index 71e2e26ba..68917b675 100644
--- a/backend/teco2.h
+++ b/backend/teco2.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
 
    This file is part of the SANE package.
 
diff --git a/backend/teco3.c b/backend/teco3.c
index 6be33ec29..d9a461abc 100644
--- a/backend/teco3.c
+++ b/backend/teco3.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
    
    This file is part of the SANE package.
    
diff --git a/backend/teco3.h b/backend/teco3.h
index 1046e54b9..a5ecc46e1 100644
--- a/backend/teco3.h
+++ b/backend/teco3.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
 
    This file is part of the SANE package.
 
diff --git a/frontend/tstbackend.c b/frontend/tstbackend.c
index 3367352e3..fd5a90540 100644
--- a/frontend/tstbackend.c
+++ b/frontend/tstbackend.c
@@ -2,7 +2,7 @@
    tstbackend -- backend test utility
 
    Uses the SANE library.
-   Copyright (C) 2002 Frank Zago (fzago at austin dot rr dot com)
+   Copyright (C) 2002 Frank Zago (sane at zago dot net)
 
    This file is part of the SANE package.