diff --git a/xa/misc/file65.c b/xa/misc/file65.c
index 627b52e..c6e6931 100644
--- a/xa/misc/file65.c
+++ b/xa/misc/file65.c
@@ -1,7 +1,7 @@
 /* file65 -- A part of xa65 - 65xx/65816 cross-assembler and utility suite
  * Print information about o65 files
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/misc/mkrom.sh b/xa/misc/mkrom.sh
index 3f0297b..e2f9680 100755
--- a/xa/misc/mkrom.sh
+++ b/xa/misc/mkrom.sh
@@ -2,7 +2,7 @@
 #
 #    xa65 - 6502 cross assembler and utility suite
 #    mkrom.sh - assemble several 'romable' files into one binary
-#    Copyright (C) 1997 André Fachat (a.fachat@physik.tu-chemnitz.de)
+#    Copyright (C) 1997 Andre Fachat (afachat@gmx.de)
 #
 #    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/xa/misc/printcbm.c b/xa/misc/printcbm.c
index fb9521a..407e341 100644
--- a/xa/misc/printcbm.c
+++ b/xa/misc/printcbm.c
@@ -1,7 +1,7 @@
 /* printcbm -- A part of xa65 - 65xx/65816 cross-assembler and utility suite
  * list CBM BASIC programs
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/misc/reloc65.c b/xa/misc/reloc65.c
index 760da22..84b9469 100644
--- a/xa/misc/reloc65.c
+++ b/xa/misc/reloc65.c
@@ -1,7 +1,7 @@
 /* reloc65 -- A part of xa65 - 65xx/65816 cross-assembler and utility suite
  * o65 file relocator
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/misc/uncpk.c b/xa/misc/uncpk.c
index bbb4632..ce8e179 100644
--- a/xa/misc/uncpk.c
+++ b/xa/misc/uncpk.c
@@ -1,7 +1,7 @@
 /* reloc65 -- A part of xa65 - 65xx/65816 cross-assembler and utility suite
  * Pack/Unpack cpk archive files
  *
- * Copyright (C) 1989-2002 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-2002 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/misc/version.h b/xa/misc/version.h
index d9cb529..1f9e7bc 100644
--- a/xa/misc/version.h
+++ b/xa/misc/version.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/version.h b/xa/src/version.h
index 83ad9e3..d6de8db 100644
--- a/xa/src/version.h
+++ b/xa/src/version.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xa.c b/xa/src/xa.c
index 41a93a7..c120b57 100644
--- a/xa/src/xa.c
+++ b/xa/src/xa.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  * maintained by Cameron Kaiser (ckaiser@floodgap.com)
  *
  * Main program
diff --git a/xa/src/xa.h b/xa/src/xa.h
index 44045c1..f3bddca 100644
--- a/xa/src/xa.h
+++ b/xa/src/xa.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xaa.c b/xa/src/xaa.c
index 6a37faf..d341bd1 100644
--- a/xa/src/xaa.c
+++ b/xa/src/xaa.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * Preprocessing arithmetic module
  *
diff --git a/xa/src/xaa.h b/xa/src/xaa.h
index e5381a7..597770c 100644
--- a/xa/src/xaa.h
+++ b/xa/src/xaa.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xacharset.c b/xa/src/xacharset.c
index ea3e4e8..5e55900 100644
--- a/xa/src/xacharset.c
+++ b/xa/src/xacharset.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andre Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  * Maintained by Cameron Kaiser
  *
  * Charset conversion module
diff --git a/xa/src/xacharset.h b/xa/src/xacharset.h
index 9addb65..79efaf2 100644
--- a/xa/src/xacharset.h
+++ b/xa/src/xacharset.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-2006 André Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-2006 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xad.h b/xa/src/xad.h
index 244241f..7a32345 100644
--- a/xa/src/xad.h
+++ b/xa/src/xad.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 André Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xah.h b/xa/src/xah.h
index 913c9fa..0d6f291 100644
--- a/xa/src/xah.h
+++ b/xa/src/xah.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  * Maintained by Cameron Kaiser
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/xa/src/xah2.h b/xa/src/xah2.h
index 992009b..846ae42 100644
--- a/xa/src/xah2.h
+++ b/xa/src/xah2.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xal.c b/xa/src/xal.c
index 36b0ce6..0228484 100644
--- a/xa/src/xal.c
+++ b/xa/src/xal.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * Label management module (also see xau.c)
  *
diff --git a/xa/src/xal.h b/xa/src/xal.h
index 273fed3..4c800c3 100644
--- a/xa/src/xal.h
+++ b/xa/src/xal.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xalisting.c b/xa/src/xalisting.c
index cfc9443..8328edd 100644
--- a/xa/src/xalisting.c
+++ b/xa/src/xalisting.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  * maintained by Cameron Kaiser
  *
  * Assembler listing
diff --git a/xa/src/xalisting.h b/xa/src/xalisting.h
index e2f1bd9..77cdc31 100644
--- a/xa/src/xalisting.h
+++ b/xa/src/xalisting.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 André Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xam.c b/xa/src/xam.c
index cb53872..c99751c 100644
--- a/xa/src/xam.c
+++ b/xa/src/xam.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * Memory manager/malloc() stub module
  *
diff --git a/xa/src/xam.h b/xa/src/xam.h
index a0b37cc..b28fdc4 100644
--- a/xa/src/xam.h
+++ b/xa/src/xam.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xao.c b/xa/src/xao.c
index 817c177..ecde792 100644
--- a/xa/src/xao.c
+++ b/xa/src/xao.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * Options module (handles pass options and writing them out to disk)
  *
diff --git a/xa/src/xao.h b/xa/src/xao.h
index 2f2df40..126c62c 100644
--- a/xa/src/xao.h
+++ b/xa/src/xao.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 André Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xap.c b/xa/src/xap.c
index 2cccfe4..46dabc9 100644
--- a/xa/src/xap.c
+++ b/xa/src/xap.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  * Maintained by Cameron Kaiser
  *
  * File handling and preprocessor (also see xaa.c) module
diff --git a/xa/src/xap.h b/xa/src/xap.h
index 2b01dfd..df86bfc 100644
--- a/xa/src/xap.h
+++ b/xa/src/xap.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xar.c b/xa/src/xar.c
index 7ae6227..c3d0c5e 100644
--- a/xa/src/xar.c
+++ b/xa/src/xar.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * Relocation module (for relocatable objects)
  *
diff --git a/xa/src/xar.h b/xa/src/xar.h
index 2b6eae3..283d053 100644
--- a/xa/src/xar.h
+++ b/xa/src/xar.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xar2.c b/xa/src/xar2.c
index a8cd231..42b6c7f 100644
--- a/xa/src/xar2.c
+++ b/xa/src/xar2.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xat.c b/xa/src/xat.c
index dce95ff..88df13b 100644
--- a/xa/src/xat.c
+++ b/xa/src/xat.c
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  * maintained by Cameron Kaiser
  *
  * Core tokenizing module/pass 1 and pass 2
diff --git a/xa/src/xat.h b/xa/src/xat.h
index 6e88bdd..e603c82 100644
--- a/xa/src/xat.h
+++ b/xa/src/xat.h
@@ -1,6 +1,6 @@
 /* xa65 - 65xx/65816 cross-assembler and utility suite
  *
- * Copyright (C) 1989-1997 André Fachat (a.fachat@physik.tu-chemnitz.de)
+ * Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
  *
  * 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/xa/src/xau.h b/xa/src/xau.h
index 0c88760..0d2b900 100644
--- a/xa/src/xau.h
+++ b/xa/src/xau.h
@@ -1,6 +1,6 @@
 /*
  xa65 - 6502 cross assembler and utility suite
- Copyright (C) 1989-1997 Andr� Fachat (a.fachat@physik.tu-chemnitz.de)
+ Copyright (C) 1989-1997 Andre Fachat (afachat@gmx.de)
 
  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