diff --git a/README b/README
index 37fa482f..26341342 100644
--- a/README
+++ b/README
@@ -146,7 +146,7 @@ Markus & Laszlo
 
 
    Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   markus@oberhumer.com                      ml1050@cdata.tvnet.hu
 
 
 
diff --git a/doc/upx.pod b/doc/upx.pod
index 8e8f1625..e2e41483 100644
--- a/doc/upx.pod
+++ b/doc/upx.pod
@@ -849,8 +849,8 @@ Please report all bugs immediately to the authors.
 
 =head1 AUTHORS
 
- Markus F.X.J. Oberhumer <markus.oberhumer@jk.uni-linz.ac.at>
- http://wildsau.idv.uni-linz.ac.at/mfx/
+ Markus F.X.J. Oberhumer <markus@oberhumer.com>
+ http://www.oberhumer.com/mfx/
 
  Laszlo Molnar <ml1050@cdata.tvnet.hu>
 
diff --git a/src/bele.h b/src/bele.h
index ea4b25f3..0e08f968 100644
--- a/src/bele.h
+++ b/src/bele.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/c_file.cpp b/src/c_file.cpp
index 9e02bd53..ef1646c7 100644
--- a/src/c_file.cpp
+++ b/src/c_file.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/c_init.cpp b/src/c_init.cpp
index 8ecf18eb..4f34bf89 100644
--- a/src/c_init.cpp
+++ b/src/c_init.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/c_none.cpp b/src/c_none.cpp
index 966d6538..7278a958 100644
--- a/src/c_none.cpp
+++ b/src/c_none.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/c_screen.cpp b/src/c_screen.cpp
index 3786cdf8..257f9956 100644
--- a/src/c_screen.cpp
+++ b/src/c_screen.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/compress.cpp b/src/compress.cpp
index 53480eda..a96bb753 100644
--- a/src/compress.cpp
+++ b/src/compress.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/conf.h b/src/conf.h
index 7b178d0b..4f8f3ac0 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/console.h b/src/console.h
index b5a113a3..6c9e18ff 100644
--- a/src/console.h
+++ b/src/console.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/except.cpp b/src/except.cpp
index a4f68906..2f9f1efc 100644
--- a/src/except.cpp
+++ b/src/except.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/except.h b/src/except.h
index f848134b..45d89335 100644
--- a/src/except.h
+++ b/src/except.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/file.cpp b/src/file.cpp
index cbb2b160..89ec83a1 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/file.h b/src/file.h
index 2806126a..cc609070 100644
--- a/src/file.h
+++ b/src/file.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/filter.cpp b/src/filter.cpp
index 9d849d76..64ce318d 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/filter.h b/src/filter.h
index 6f33d558..245ae99d 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/filter/ct.h b/src/filter/ct.h
index 807c92d7..5cf9adbf 100644
--- a/src/filter/ct.h
+++ b/src/filter/ct.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/filter/ctjo.h b/src/filter/ctjo.h
index f77fd168..a0464d29 100644
--- a/src/filter/ctjo.h
+++ b/src/filter/ctjo.h
@@ -22,8 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/filter/cto.h b/src/filter/cto.h
index 37f6f53a..b219ae63 100644
--- a/src/filter/cto.h
+++ b/src/filter/cto.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/filter/ctsw.h b/src/filter/ctsw.h
index 3d386599..ba742834 100644
--- a/src/filter/ctsw.h
+++ b/src/filter/ctsw.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/filter/sw.h b/src/filter/sw.h
index 5bb9f934..a15ce44f 100644
--- a/src/filter/sw.h
+++ b/src/filter/sw.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/filteri.cpp b/src/filteri.cpp
index 8d18393e..e17b9337 100644
--- a/src/filteri.cpp
+++ b/src/filteri.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/help.cpp b/src/help.cpp
index 699aa2a8..c95c17c6 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
@@ -301,13 +301,14 @@ con_fprintf(f,
     int fg = con_fg(f,FG_CYAN);
 con_fprintf(f,
         "        http://upx.tsx.org\n"
+        "        http://www.oberhumer.com/upx/\n"
         "        http://wildsau.idv.uni-linz.ac.at/mfx/upx.html\n"
     );
     (void)con_fg(f,FG_ORANGE);
 con_fprintf(f,
         "\n"
         "   Markus F.X.J. Oberhumer                   Laszlo Molnar\n"
-        "   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu\n"
+        "   markus@oberhumer.com                      ml1050@cdata.tvnet.hu\n"
     );
     fg = con_fg(f,fg);
 }
diff --git a/src/lefile.cpp b/src/lefile.cpp
index 95ddf08b..190f5a56 100644
--- a/src/lefile.cpp
+++ b/src/lefile.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/lefile.h b/src/lefile.h
index eae6250c..773573da 100644
--- a/src/lefile.h
+++ b/src/lefile.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/linker.cpp b/src/linker.cpp
index f6965e01..403f565b 100644
--- a/src/linker.cpp
+++ b/src/linker.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/linker.h b/src/linker.h
index b48c6eee..02597d52 100644
--- a/src/linker.h
+++ b/src/linker.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/main.cpp b/src/main.cpp
index 11800e55..8f0eb121 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/mem.cpp b/src/mem.cpp
index 1c1c404f..863e7f8c 100644
--- a/src/mem.cpp
+++ b/src/mem.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/mem.h b/src/mem.h
index cfab03bc..195e78e4 100644
--- a/src/mem.h
+++ b/src/mem.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/msg.cpp b/src/msg.cpp
index 272a53e6..d6339bb0 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_com.cpp b/src/p_com.cpp
index c3a0ee6f..d5a6395e 100644
--- a/src/p_com.cpp
+++ b/src/p_com.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_com.h b/src/p_com.h
index 0af6b681..c958a76a 100644
--- a/src/p_com.h
+++ b/src/p_com.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_djgpp2.cpp b/src/p_djgpp2.cpp
index 4fd76eb6..00bc2dae 100644
--- a/src/p_djgpp2.cpp
+++ b/src/p_djgpp2.cpp
@@ -21,10 +21,11 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
+
 #include "conf.h"
 #include "file.h"
 #include "filter.h"
diff --git a/src/p_djgpp2.h b/src/p_djgpp2.h
index 120f820b..172fbca7 100644
--- a/src/p_djgpp2.h
+++ b/src/p_djgpp2.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_elf.h b/src/p_elf.h
index 2415f971..ffbf1c04 100644
--- a/src/p_elf.h
+++ b/src/p_elf.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_elks.cpp b/src/p_elks.cpp
index 8241d897..79285bef 100644
--- a/src/p_elks.cpp
+++ b/src/p_elks.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_exe.cpp b/src/p_exe.cpp
index b775c917..d312eb24 100644
--- a/src/p_exe.cpp
+++ b/src/p_exe.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_exe.h b/src/p_exe.h
index 7e4f8220..021e9b88 100644
--- a/src/p_exe.h
+++ b/src/p_exe.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index d47bcea3..09a6c324 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -22,11 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/p_lx_elf.h b/src/p_lx_elf.h
index 6f01b549..f208fcdf 100644
--- a/src/p_lx_elf.h
+++ b/src/p_lx_elf.h
@@ -22,11 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/p_lx_exc.cpp b/src/p_lx_exc.cpp
index 6d5a63e7..e38655e0 100644
--- a/src/p_lx_exc.cpp
+++ b/src/p_lx_exc.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_lx_exc.h b/src/p_lx_exc.h
index 650ba68e..f9e37da1 100644
--- a/src/p_lx_exc.h
+++ b/src/p_lx_exc.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_lx_sep.cpp b/src/p_lx_sep.cpp
index 82f1f779..154194a9 100644
--- a/src/p_lx_sep.cpp
+++ b/src/p_lx_sep.cpp
@@ -22,11 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/p_lx_sep.h b/src/p_lx_sep.h
index 3dc34bd8..7514ec7f 100644
--- a/src/p_lx_sep.h
+++ b/src/p_lx_sep.h
@@ -22,8 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/p_lx_sh.cpp b/src/p_lx_sh.cpp
index d96261cc..22f9f0df 100644
--- a/src/p_lx_sh.cpp
+++ b/src/p_lx_sh.cpp
@@ -22,11 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/p_lx_sh.h b/src/p_lx_sh.h
index 051736f1..90f95188 100644
--- a/src/p_lx_sh.h
+++ b/src/p_lx_sh.h
@@ -22,11 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/p_sys.cpp b/src/p_sys.cpp
index 8986d6dc..c4c3b487 100644
--- a/src/p_sys.cpp
+++ b/src/p_sys.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_sys.h b/src/p_sys.h
index 805dbc46..02088ddd 100644
--- a/src/p_sys.h
+++ b/src/p_sys.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_tmt.cpp b/src/p_tmt.cpp
index 3a59141a..ca5fb353 100644
--- a/src/p_tmt.cpp
+++ b/src/p_tmt.cpp
@@ -21,10 +21,11 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
+
 #include "conf.h"
 #include "file.h"
 #include "filter.h"
diff --git a/src/p_tmt.h b/src/p_tmt.h
index 6bf8f3f4..cc70199e 100644
--- a/src/p_tmt.h
+++ b/src/p_tmt.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_tos.cpp b/src/p_tos.cpp
index a284cfad..a3ae6373 100644
--- a/src/p_tos.cpp
+++ b/src/p_tos.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_tos.h b/src/p_tos.h
index 49d7271f..878f3d44 100644
--- a/src/p_tos.h
+++ b/src/p_tos.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_unix.cpp b/src/p_unix.cpp
index a872f57b..28103a86 100644
--- a/src/p_unix.cpp
+++ b/src/p_unix.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_unix.h b/src/p_unix.h
index f12d6a55..5a9d987b 100644
--- a/src/p_unix.h
+++ b/src/p_unix.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_vmlinz.cpp b/src/p_vmlinz.cpp
index 5aef40c1..740db520 100644
--- a/src/p_vmlinz.cpp
+++ b/src/p_vmlinz.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_vmlinz.h b/src/p_vmlinz.h
index 5bd7ef7b..722dd8fd 100644
--- a/src/p_vmlinz.h
+++ b/src/p_vmlinz.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_vxd.h b/src/p_vxd.h
index 1f6e4a1b..167adc82 100644
--- a/src/p_vxd.h
+++ b/src/p_vxd.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_w16ne.cpp b/src/p_w16ne.cpp
index 088c69e2..62a188ca 100644
--- a/src/p_w16ne.cpp
+++ b/src/p_w16ne.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_w16ne.h b/src/p_w16ne.h
index dfc590c6..821c9884 100644
--- a/src/p_w16ne.h
+++ b/src/p_w16ne.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_w32pe.cpp b/src/p_w32pe.cpp
index 0e542bcb..8c19c4d8 100644
--- a/src/p_w32pe.cpp
+++ b/src/p_w32pe.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_w32pe.h b/src/p_w32pe.h
index 96ad36da..35353436 100644
--- a/src/p_w32pe.h
+++ b/src/p_w32pe.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_wcle.cpp b/src/p_wcle.cpp
index 6438a512..33fae77d 100644
--- a/src/p_wcle.cpp
+++ b/src/p_wcle.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/p_wcle.h b/src/p_wcle.h
index 9757cfde..04331768 100644
--- a/src/p_wcle.h
+++ b/src/p_wcle.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/packer.cpp b/src/packer.cpp
index 2105718a..113fb111 100644
--- a/src/packer.cpp
+++ b/src/packer.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/packer.h b/src/packer.h
index 48d1f30e..c7002b6b 100644
--- a/src/packer.h
+++ b/src/packer.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/packhead.cpp b/src/packhead.cpp
index 3cff9373..76a44de9 100644
--- a/src/packhead.cpp
+++ b/src/packhead.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/packmast.cpp b/src/packmast.cpp
index cc99dbec..276a20d4 100644
--- a/src/packmast.cpp
+++ b/src/packmast.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/packmast.h b/src/packmast.h
index 2d50a16c..5863e61f 100644
--- a/src/packmast.h
+++ b/src/packmast.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/s_djgpp2.cpp b/src/s_djgpp2.cpp
index 2ad12016..55b5b9fb 100644
--- a/src/s_djgpp2.cpp
+++ b/src/s_djgpp2.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/s_object.cpp b/src/s_object.cpp
index 4cd30a11..45eee5f0 100644
--- a/src/s_object.cpp
+++ b/src/s_object.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/s_vcsa.cpp b/src/s_vcsa.cpp
index 01cd6945..9dcd30ed 100644
--- a/src/s_vcsa.cpp
+++ b/src/s_vcsa.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/s_win32.cpp b/src/s_win32.cpp
index 31e11730..9d6ff21c 100644
--- a/src/s_win32.cpp
+++ b/src/s_win32.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/screen.h b/src/screen.h
index 0b8fccef..d3b79088 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/stdcxx.cpp b/src/stdcxx.cpp
index 6326768a..249072a6 100644
--- a/src/stdcxx.cpp
+++ b/src/stdcxx.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/stdcxx.h b/src/stdcxx.h
index 744164c7..aa2e53f3 100644
--- a/src/stdcxx.h
+++ b/src/stdcxx.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/stub/header.ash b/src/stub/header.ash
index b3b5c3e0..28ba8b5b 100644
--- a/src/stub/header.ash
+++ b/src/stub/header.ash
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/ident.ash b/src/stub/ident.ash
index 15ce2845..409f6ed3 100644
--- a/src/stub/ident.ash
+++ b/src/stub/ident.ash
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/ident_n.ash b/src/stub/ident_n.ash
index 62763d7b..18c8426d 100644
--- a/src/stub/ident_n.ash
+++ b/src/stub/ident_n.ash
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/ident_s.ash b/src/stub/ident_s.ash
index 18d65728..9103174d 100644
--- a/src/stub/ident_s.ash
+++ b/src/stub/ident_s.ash
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_com.asm b/src/stub/l_com.asm
index bf54c669..c633eaa6 100644
--- a/src/stub/l_com.asm
+++ b/src/stub/l_com.asm
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_djgpp2.asm b/src/stub/l_djgpp2.asm
index 1b750cce..39a17689 100644
--- a/src/stub/l_djgpp2.asm
+++ b/src/stub/l_djgpp2.asm
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_exe.asm b/src/stub/l_exe.asm
index 915117fd..e5104a14 100644
--- a/src/stub/l_exe.asm
+++ b/src/stub/l_exe.asm
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_lx_elf.c b/src/stub/l_lx_elf.c
index 7362ed44..a5e6fdf2 100644
--- a/src/stub/l_lx_elf.c
+++ b/src/stub/l_lx_elf.c
@@ -22,11 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/stub/l_lx_elf86.asm b/src/stub/l_lx_elf86.asm
index e3e624fe..711e5323 100644
--- a/src/stub/l_lx_elf86.asm
+++ b/src/stub/l_lx_elf86.asm
@@ -22,11 +22,9 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
 ;
-;  John F. Reiser
-;  jreiser@BitWagon.com
 
 
                 BITS    32
diff --git a/src/stub/l_lx_elf86.lds b/src/stub/l_lx_elf86.lds
index 76ce67c2..9e066473 100644
--- a/src/stub/l_lx_elf86.lds
+++ b/src/stub/l_lx_elf86.lds
@@ -20,11 +20,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/stub/l_lx_exec.c b/src/stub/l_lx_exec.c
index a863a75f..241201ce 100644
--- a/src/stub/l_lx_exec.c
+++ b/src/stub/l_lx_exec.c
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/stub/l_lx_exec86.asm b/src/stub/l_lx_exec86.asm
index 607e7b45..dc5df28b 100644
--- a/src/stub/l_lx_exec86.asm
+++ b/src/stub/l_lx_exec86.asm
@@ -22,11 +22,9 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
 ;
-;  John F. Reiser
-;  jreiser@BitWagon.com
 
 
                 BITS    32
diff --git a/src/stub/l_lx_exec86.lds b/src/stub/l_lx_exec86.lds
index 7e849384..c2cf8b88 100644
--- a/src/stub/l_lx_exec86.lds
+++ b/src/stub/l_lx_exec86.lds
@@ -20,11 +20,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/stub/l_lx_sep.c b/src/stub/l_lx_sep.c
index 791da23b..56f4ad27 100644
--- a/src/stub/l_lx_sep.c
+++ b/src/stub/l_lx_sep.c
@@ -22,11 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/stub/l_lx_sep86.asm b/src/stub/l_lx_sep86.asm
index 974ccc70..70548e69 100644
--- a/src/stub/l_lx_sep86.asm
+++ b/src/stub/l_lx_sep86.asm
@@ -22,11 +22,9 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
 ;
-;  John F. Reiser
-;  jreiser@BitWagon.com
 
 
                 BITS    32
diff --git a/src/stub/l_lx_sep86.lds b/src/stub/l_lx_sep86.lds
index 929b0a31..8695c363 100644
--- a/src/stub/l_lx_sep86.lds
+++ b/src/stub/l_lx_sep86.lds
@@ -20,11 +20,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/stub/l_lx_sh.c b/src/stub/l_lx_sh.c
index eeee88d4..9125bf5d 100644
--- a/src/stub/l_lx_sh.c
+++ b/src/stub/l_lx_sh.c
@@ -22,11 +22,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/stub/l_lx_sh86.asm b/src/stub/l_lx_sh86.asm
index a9e6c8ba..afa9fd0c 100644
--- a/src/stub/l_lx_sh86.asm
+++ b/src/stub/l_lx_sh86.asm
@@ -22,11 +22,9 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
 ;
-;  John F. Reiser
-;  jreiser@BitWagon.com
 
 
                 BITS    32
diff --git a/src/stub/l_lx_sh86.lds b/src/stub/l_lx_sh86.lds
index a45f128c..08d1224c 100644
--- a/src/stub/l_lx_sh86.lds
+++ b/src/stub/l_lx_sh86.lds
@@ -20,11 +20,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
+   Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
  */
 
 
diff --git a/src/stub/l_sys.asm b/src/stub/l_sys.asm
index 8280ede6..9d02aa20 100644
--- a/src/stub/l_sys.asm
+++ b/src/stub/l_sys.asm
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_tmt.asm b/src/stub/l_tmt.asm
index 83c38b6a..8d35479d 100644
--- a/src/stub/l_tmt.asm
+++ b/src/stub/l_tmt.asm
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_tos.s b/src/stub/l_tos.s
index f6449646..c8155cf3 100644
--- a/src/stub/l_tos.s
+++ b/src/stub/l_tos.s
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_vmlinz.asm b/src/stub/l_vmlinz.asm
index d725c867..ed5137d9 100644
--- a/src/stub/l_vmlinz.asm
+++ b/src/stub/l_vmlinz.asm
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_w32pe.asm b/src/stub/l_w32pe.asm
index 16e45cb9..94f43198 100644
--- a/src/stub/l_w32pe.asm
+++ b/src/stub/l_w32pe.asm
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/l_wcle.asm b/src/stub/l_wcle.asm
index 93969bc8..d6e75720 100644
--- a/src/stub/l_wcle.asm
+++ b/src/stub/l_wcle.asm
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/linux.hh b/src/stub/linux.hh
index a2e38237..29dfe5b6 100644
--- a/src/stub/linux.hh
+++ b/src/stub/linux.hh
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/stub/macros.ash b/src/stub/macros.ash
index 445f61c0..a27f09ea 100644
--- a/src/stub/macros.ash
+++ b/src/stub/macros.ash
@@ -21,8 +21,8 @@
 ;  If not, write to the Free Software Foundation, Inc.,
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
-;  Markus F.X.J. Oberhumer                   Laszlo Molnar
-;  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+;  Markus F.X.J. Oberhumer   Laszlo Molnar
+;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 ;
 
 
diff --git a/src/stub/scripts/app.pl b/src/stub/scripts/app.pl
index bfd9ae50..d0abae2d 100644
--- a/src/stub/scripts/app.pl
+++ b/src/stub/scripts/app.pl
@@ -23,8 +23,8 @@
 #  If not, write to the Free Software Foundation, Inc.,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-#  Markus F.X.J. Oberhumer                   Laszlo Molnar
-#  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+#  Markus F.X.J. Oberhumer   Laszlo Molnar
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 #
 
 #
diff --git a/src/stub/scripts/asl_68k.sh b/src/stub/scripts/asl_68k.sh
index 7974c05d..7f073fb0 100644
--- a/src/stub/scripts/asl_68k.sh
+++ b/src/stub/scripts/asl_68k.sh
@@ -1,6 +1,35 @@
-#!/bin/sh
+#! /bin/sh
 set -e
 
+#
+#  asl_68k.sh --
+#
+#  This file is part of the UPX executable compressor.
+#
+#  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+#  Copyright (C) 1996-2001 Laszlo Molnar
+#  All Rights Reserved.
+#
+#  UPX and the UCL library are free software; you can redistribute them
+#  and/or modify them under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of
+#  the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; see the file COPYING.
+#  If not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#  Markus F.X.J. Oberhumer   Laszlo Molnar
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+#
+
+
 # wrapper for the ASL cross-assembler (version 1.42bld9)
 #   http://john.ccac.rwth-aachen.de:8000/as/
 #   http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/
diff --git a/src/stub/scripts/bin2h.pl b/src/stub/scripts/bin2h.pl
index 3cdc2680..2fe0a908 100644
--- a/src/stub/scripts/bin2h.pl
+++ b/src/stub/scripts/bin2h.pl
@@ -23,8 +23,8 @@
 #  If not, write to the Free Software Foundation, Inc.,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-#  Markus F.X.J. Oberhumer                   Laszlo Molnar
-#  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+#  Markus F.X.J. Oberhumer   Laszlo Molnar
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 #
 
 
@@ -81,8 +81,8 @@ print <<"EOF";
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer\@jk.uni-linz.ac.at        ml1050\@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus\@oberhumer.com      ml1050\@cdata.tvnet.hu
  */
 
 
diff --git a/src/stub/scripts/brandelf.pl b/src/stub/scripts/brandelf.pl
index 04357962..8a838a36 100644
--- a/src/stub/scripts/brandelf.pl
+++ b/src/stub/scripts/brandelf.pl
@@ -23,8 +23,8 @@
 #  If not, write to the Free Software Foundation, Inc.,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-#  Markus F.X.J. Oberhumer                   Laszlo Molnar
-#  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+#  Markus F.X.J. Oberhumer   Laszlo Molnar
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 #
 
 
diff --git a/src/stub/scripts/o2bin.pl b/src/stub/scripts/o2bin.pl
index 55bc7401..18c6ec67 100644
--- a/src/stub/scripts/o2bin.pl
+++ b/src/stub/scripts/o2bin.pl
@@ -23,8 +23,8 @@
 #  If not, write to the Free Software Foundation, Inc.,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-#  Markus F.X.J. Oberhumer                   Laszlo Molnar
-#  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+#  Markus F.X.J. Oberhumer   Laszlo Molnar
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 #
 
 
diff --git a/src/stub/scripts/setfold.pl b/src/stub/scripts/setfold.pl
index 5bb1c0b0..d742994c 100644
--- a/src/stub/scripts/setfold.pl
+++ b/src/stub/scripts/setfold.pl
@@ -22,10 +22,11 @@
 #  If not, write to the Free Software Foundation, Inc.,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-#  John Reiser
-#  jreiser@BitWagon.com
+#  Markus F.X.J. Oberhumer   Laszlo Molnar           John F. Reiser
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
 #
 
+
 $fname = shift || die;
 sysopen (FH,$fname,2) || die;
 binmode FH;
diff --git a/src/stub/scripts/setfold.sh b/src/stub/scripts/setfold.sh
index cad0dd35..133942d0 100644
--- a/src/stub/scripts/setfold.sh
+++ b/src/stub/scripts/setfold.sh
@@ -1,6 +1,35 @@
-#!/bin/sh
+#! /bin/sh
 set -e
 
+#
+#  setfold.sh --
+#
+#  This file is part of the UPX executable compressor.
+#
+#  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+#  Copyright (C) 1996-2001 Laszlo Molnar
+#  All Rights Reserved.
+#
+#  UPX and the UCL library are free software; you can redistribute them
+#  and/or modify them under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of
+#  the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; see the file COPYING.
+#  If not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#  Markus F.X.J. Oberhumer   Laszlo Molnar
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+#
+
+
 file="$1"
 
 # get directory of this script
diff --git a/src/stub/scripts/stripelf.pl b/src/stub/scripts/stripelf.pl
index 0cad1768..b1889277 100644
--- a/src/stub/scripts/stripelf.pl
+++ b/src/stub/scripts/stripelf.pl
@@ -23,8 +23,8 @@
 #  If not, write to the Free Software Foundation, Inc.,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-#  Markus F.X.J. Oberhumer                   Laszlo Molnar
-#  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+#  Markus F.X.J. Oberhumer   Laszlo Molnar
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 #
 
 #
diff --git a/src/stub/scripts/version.pl b/src/stub/scripts/version.pl
index a888c8d7..9aabd1bd 100644
--- a/src/stub/scripts/version.pl
+++ b/src/stub/scripts/version.pl
@@ -23,10 +23,11 @@
 #  If not, write to the Free Software Foundation, Inc.,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-#  Markus F.X.J. Oberhumer                   Laszlo Molnar
-#  markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+#  Markus F.X.J. Oberhumer   Laszlo Molnar
+#  markus@oberhumer.com      ml1050@cdata.tvnet.hu
 #
 
+
 $mode = shift || "--nasm";
 while (<>) {
     chop;
diff --git a/src/tailor.h b/src/tailor.h
index 0f238127..143d42fe 100644
--- a/src/tailor.h
+++ b/src/tailor.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/ui.cpp b/src/ui.cpp
index f3f8ab76..b883ed29 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/ui.h b/src/ui.h
index 8a31e2a1..e2b7c4d0 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/unupx.h b/src/unupx.h
index ab8d3927..69c2d8c4 100644
--- a/src/unupx.h
+++ b/src/unupx.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/util.cpp b/src/util.cpp
index 1a67ac3b..eea8512e 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/util.h b/src/util.h
index 1db383f8..d507349a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */
 
 
diff --git a/src/work.cpp b/src/work.cpp
index b9a08868..0ee6ca5d 100644
--- a/src/work.cpp
+++ b/src/work.cpp
@@ -21,8 +21,8 @@
    If not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@cdata.tvnet.hu
  */