diff --git a/EXTENSIONS b/EXTENSIONS
index 922b134fb3245..6f1a2a3aa385f 100644
--- a/EXTENSIONS
+++ b/EXTENSIONS
@@ -109,7 +109,7 @@ STATUS:              Experimental
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           interbase
-PRIMARY MAINTAINER:  Jouni Ahto <jah@mork.net>
+PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -128,7 +128,7 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
-PRIMARY MAINTAINER:  Jouni Ahto <jah@mork.net>
+PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index ff1ab84237872..4479834385f4b 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -15,7 +15,7 @@
    | Authors: Danny Heijl  <Danny.Heijl@cevi.be> : initial cut (ODS 7.2x) |
    |                                               PHP4 port              |
    |          Christian Cartus <chc@idgruppe.de> : blobs, and IUS 9       |
-   |          Jouni Ahto <jah@mork.net>   : configuration stuff           |
+   |          Jouni Ahto <jouni.ahto@exdec.fi>   : configuration stuff    |
    | Based on the MySQL code by:  Zeev Suraski <zeev@php.net>             |
    +----------------------------------------------------------------------+
 */
diff --git a/ext/informix/php_informix.h b/ext/informix/php_informix.h
index 7b78b580c519a..25713240369d2 100644
--- a/ext/informix/php_informix.h
+++ b/ext/informix/php_informix.h
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
    | Authors: Danny Heijl <Danny.Heijl@cevi.be>, initial cut (ODS 7)      |
    |          Christian Cartus <chc@idgruppe.de>, blobs, and IUS 9        |
-   |          Jouni Ahto <jah@mork.net>   : configuration stuff           |
+   |          Jouni Ahto <jouni.ahto@exdec.fi>, configuration stuff       |
    | based on mysql code by: Zeev Suraski <zeev@php.net>                  |
    +----------------------------------------------------------------------+
  */
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 23057bb6d44ae..a1806b0976e92 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -12,7 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors: Jouni Ahto <jah@mork.net>                                   |
+   | Authors: Jouni Ahto <jouni.ahto@exdec.fi>                            |
    |          Andrew Avdeev <andy@rsc.mv.ru>                              |
    +----------------------------------------------------------------------+
  */
diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index 0f532c344d54e..fb0885c2de235 100644
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -12,8 +12,8 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors: Jouni Ahto <jah@mork.net>					                  |
-   |		  Andrew Avdeev <andy@simgts.mv.ru>							  |
+   | Authors: Jouni Ahto <jouni.ahto@exdec.fi>                            |
+   |          Andrew Avdeev <andy@simgts.mv.ru>                           |
    +----------------------------------------------------------------------+
  */
 
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 76bd96216dbf7..4962ca92bc3d5 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Zeev Suraski <zeev@zend.com>                                |
-   |          Jouni Ahto <jah@mork.net> (large object interface)          |
+   |          Jouni Ahto <jouni.ahto@exdec.fi> (large object interface)   |
    +----------------------------------------------------------------------+
  */
  
diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index e4023f9a6c855..61796519d71b1 100644
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Zeev Suraski <zeev@zend.com>                                |
-   |          Jouni Ahto <jah@mork.net>                                   |
+   |          Jouni Ahto <jouni.ahto@exdec.fi>                            |
    +----------------------------------------------------------------------+
  */