diff --git a/lib/include/msql.h b/lib/include/msql.h
index 8769c15f5cb3f0cf6548698a01a138615cdf6ceb..e87d3e822b2ad681982c51d16585a8a96d31e68e 100644
--- a/lib/include/msql.h
+++ b/lib/include/msql.h
@@ -1,3 +1,3 @@
-// Msql module support stuff, (C) 1997 Francesco Chemolli <kinkie@comedia.it>
+// Msql module support stuff, (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 import Msql;
diff --git a/lib/modules/Sql.pmod/msql.pike b/lib/modules/Sql.pmod/msql.pike
index 9d09ba16c228e6a3c04af7a31c26bae8ce9d878a..02ae41a67291a82dfb0ffe87abe1969bc71f58cf 100644
--- a/lib/modules/Sql.pmod/msql.pike
+++ b/lib/modules/Sql.pmod/msql.pike
@@ -1,4 +1,4 @@
-// Msql module support stuff, (C) 1997 Francesco Chemolli <kinkie@comedia.it>
+// Msql module support stuff, (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 inherit Msql.msql;
 
diff --git a/lib/modules/Sql.pmod/postgres.pike b/lib/modules/Sql.pmod/postgres.pike
index 062ace927323bec02db57b5a3e0547755ffbd42e..f6407d0c87bf048c808cc22ecb2f9f7e293da314 100644
--- a/lib/modules/Sql.pmod/postgres.pike
+++ b/lib/modules/Sql.pmod/postgres.pike
@@ -1,8 +1,8 @@
 /*
  * This is part of the Postgres module for Pike.
- * (C) 1997 Francesco Chemolli <kinkie@comedia.it>
+ * (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
  *
- * $Id: postgres.pike,v 1.2 1997/11/25 20:58:17 grubba Exp $
+ * $Id: postgres.pike,v 1.3 1998/07/15 19:04:18 grubba Exp $
  *
  */
 
diff --git a/src/modules/Msql/COPYING b/src/modules/Msql/COPYING
index ae18060d5221e11d214aa1106b4f77f600189dbe..b7d719b7e32f279ff0f8941fb64f574e32c757fc 100644
--- a/src/modules/Msql/COPYING
+++ b/src/modules/Msql/COPYING
@@ -1,4 +1,4 @@
-This code is (c) 1996,1997 Francesco Chemolli <kinkie@comedia.it>
+This code is (c) 1996,1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 It may be copied and distributed freely under the terms of the GNU
 General Public License, version 2.
diff --git a/src/modules/Msql/configure.in b/src/modules/Msql/configure.in
index f0231f2300d0c3bb5c6e067e13e43f8a1bc2f349..a265f6f88620f2c522104cc6d562e72d3cc3335a 100644
--- a/src/modules/Msql/configure.in
+++ b/src/modules/Msql/configure.in
@@ -1,5 +1,5 @@
-dnl $Id: configure.in,v 1.2 1997/11/24 21:32:14 grubba Exp $
-dnl (C) 1997 Francesco Chemolli <kinkie@comedia.it>
+dnl $Id: configure.in,v 1.3 1998/07/15 19:03:07 grubba Exp $
+dnl (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 AC_INIT(msqlmod.c)
 AC_CONFIG_HEADER(msql_config.h)
@@ -7,7 +7,7 @@ AC_CONFIG_HEADER(msql_config.h)
 AC_ARG_WITH(msql,    [  --with(out)-msql      mSQL Database engine support ],[]
 ,[with_msql=yes])
 
-echo "Configuring msql module, (C) 1996,1997 Francesco Chemolli <kinkie@comedia.it>"
+echo "Configuring msql module, (C) 1996,1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>"
 
 sinclude(../module_configure.in)
 
diff --git a/src/modules/Msql/doc/msql b/src/modules/Msql/doc/msql
index 9e6f3ef9544b9459d87241a14ae0a1e6c592e1e1..b5269e4a95b34f9626f239e903561fcea4c90f06 100644
--- a/src/modules/Msql/doc/msql
+++ b/src/modules/Msql/doc/msql
@@ -2,7 +2,7 @@ NAME
 	Sql.msql - mSQL SQL server interface
 
 AUTHOR
-	Francesco Chemolli <kinkie@comedia.it>
+	Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 DESCRIPTION
 	This is an interface to the mSQL database server.
@@ -402,7 +402,7 @@ THANKS
 
 COPYRIGHT
 	This code and documentation are copyright 1997 Francesco Chemolli 
-	<kinkie@comedia.it>.
+	<kinkie@kame.usr.dsi.unimi.it>.
 	It may be copied, modified, redistributed under the terms of the
 	GNU General Public License, version 2.
 	
diff --git a/src/modules/Postgres/Makefile.in b/src/modules/Postgres/Makefile.in
index defb737ebc2e91b14449fc91caa6202196fe5adf..11f018d8a311720e97c3951da61143380a7aebb3 100644
--- a/src/modules/Postgres/Makefile.in
+++ b/src/modules/Postgres/Makefile.in
@@ -1,5 +1,5 @@
-# $Id: Makefile.in,v 1.2 1997/10/15 00:10:21 grubba Exp $
-# (C) 1997 Francesco Chemolli <kinkie@comedia.it>
+# $Id: Makefile.in,v 1.3 1998/07/15 19:02:40 grubba Exp $
+# (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 SRCDIR=@srcdir@
 VPATH=@srcdir@:@srcdir@/../..:../..
diff --git a/src/modules/Postgres/configure.in b/src/modules/Postgres/configure.in
index 239f1253f004c99025227c7bbe75c8edf877562d..404685d52a7285439d2b90dc1d72b6d0b0aa155b 100644
--- a/src/modules/Postgres/configure.in
+++ b/src/modules/Postgres/configure.in
@@ -1,10 +1,10 @@
-dnl $Id: configure.in,v 1.5 1998/02/02 18:30:48 grubba Exp $
-dnl (C) 1997 Francesco Chemolli <kinkie@comedia.it>
+dnl $Id: configure.in,v 1.6 1998/07/15 19:02:17 grubba Exp $
+dnl (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 AC_INIT(postgres.c)
 AC_CONFIG_HEADER(pgres_config.h)
 
-echo "Configuring Postgres module, (C) 1997 Francesco Chemolli <kinkie@comedia.it>"
+echo "Configuring Postgres module, (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>"
 
 AC_ARG_WITH(postgres,
 	[  --with(out)-postgres               postgres95 DB server support],
diff --git a/src/modules/Postgres/doc/postgres_postgres b/src/modules/Postgres/doc/postgres_postgres
index 55bf95c1ecc5230cf2b1d1d855353e04c12516a2..65ba74a016f5a57ba0312660be7f78176ecfecf5 100644
--- a/src/modules/Postgres/doc/postgres_postgres
+++ b/src/modules/Postgres/doc/postgres_postgres
@@ -2,7 +2,7 @@ NAME
 	Postgres.postgres - Postgres (Postgres95, PgSQL) _RAW_ Server interface
 
 AUTHOR
-	Francesco Chemolli <kinkie@comedia.it>
+	Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 DESCRIPTION
 	This is an interface to the Postgres (Postgres95, pgsql) database server.
@@ -248,7 +248,7 @@ THANKS
 
 COPYRIGHT
 	This code and documentation are copyright 1997 Francesco Chemolli 
-	<kinkie@comedia.it>.
+	<kinkie@kame.usr.dsi.unimi.it>.
 	It may be copied, modified, redistributed under the terms of the
 	GNU General Public License, version 2.
 	
diff --git a/src/modules/Postgres/doc/postgres_postgres_result b/src/modules/Postgres/doc/postgres_postgres_result
index 159716b027e32b8e3ab83008a35b0b9b1a9e7336..aba20c280a97bbb1e725b35c80d2808e3dbaacde 100644
--- a/src/modules/Postgres/doc/postgres_postgres_result
+++ b/src/modules/Postgres/doc/postgres_postgres_result
@@ -2,7 +2,7 @@ NAME
 	Postgres.postgres_result - result of a Postgres query 
 
 AUTHOR
-	Francesco Chemolli <kinkie@comedia.it>
+	Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 DESCRIPTION
 	Postgres.postgres_result contains the result of a Postgres-query.
@@ -24,7 +24,7 @@ THANKS
 
 COPYRIGHT
 	This code and documentation are copyright 1997 Francesco Chemolli 
-	<kinkie@comedia.it>.
+	<kinkie@kame.usr.dsi.unimi.it>.
 	It may be copied, modified, redistributed under the terms of the
 	GNU General Public License, version 2.
 	
diff --git a/src/modules/Postgres/doc/sql_postgres b/src/modules/Postgres/doc/sql_postgres
index 34a5290e2438959b825bf6e95cd5a4c5b29d00ab..ad8e05ca7280f3e4eaa652b1adfee2b56ab2228c 100644
--- a/src/modules/Postgres/doc/sql_postgres
+++ b/src/modules/Postgres/doc/sql_postgres
@@ -2,7 +2,7 @@ NAME
 	Sql.postgres - Postgres (Postgres95, PgSQL) Server interface
 
 AUTHOR
-	Francesco Chemolli <kinkie@comedia.it>
+	Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 DESCRIPTION
 	This is an interface to the Postgres (Postgres95, pgsql) database server.
@@ -364,7 +364,7 @@ THANKS
 
 COPYRIGHT
 	This code and documentation are copyright 1997 Francesco Chemolli 
-	<kinkie@comedia.it>.
+	<kinkie@kame.usr.dsi.unimi.it>.
 	It may be copied, modified, redistributed under the terms of the
 	GNU General Public License, version 2.
 	
diff --git a/src/modules/Postgres/doc/sql_postgres_result b/src/modules/Postgres/doc/sql_postgres_result
index 8533fb5a60352319b8b99d5f7264f1c951ff31aa..29c73197aa471e769ffece7c71d46b182b483baf 100644
--- a/src/modules/Postgres/doc/sql_postgres_result
+++ b/src/modules/Postgres/doc/sql_postgres_result
@@ -2,7 +2,7 @@ NAME
 	Sql.postgres_result - result of a Postgres query 
 
 AUTHOR
-	Francesco Chemolli <kinkie@comedia.it>
+	Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 DESCRIPTION
 	Sql.postgres_result contains the result of a Postgres-query.
@@ -132,7 +132,7 @@ THANKS
 
 COPYRIGHT
 	This code and documentation are copyright 1997 Francesco Chemolli 
-	<kinkie@comedia.it>.
+	<kinkie@kame.usr.dsi.unimi.it>.
 	It may be copied, modified, redistributed under the terms of the
 	GNU General Public License, version 2.
 	
diff --git a/src/modules/Postgres/pgresult.c b/src/modules/Postgres/pgresult.c
index eccd2ee78ef7d8ada3eac872a757c232df4d9b76..385d7dc2376fd72178369569e2a4b0c830d9e3aa 100644
--- a/src/modules/Postgres/pgresult.c
+++ b/src/modules/Postgres/pgresult.c
@@ -1,9 +1,9 @@
 /*
- * $Id: pgresult.c,v 1.7 1998/07/04 17:01:02 grubba Exp $
+ * $Id: pgresult.c,v 1.8 1998/07/15 19:01:31 grubba Exp $
  *
  * Postgres95 support for pike/0.5 and up
  *
- * (C) 1997 Francesco Chemolli <kinkie@comedia.it>
+ * (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
  *
  * This code is provided AS IS, and may be copied and distributed freely,
  * under the terms of the GNU General Public License, version 2.
@@ -63,7 +63,7 @@
 #include "builtin_functions.h"
 #include "module_support.h"
 
-RCSID("$Id: pgresult.c,v 1.7 1998/07/04 17:01:02 grubba Exp $");
+RCSID("$Id: pgresult.c,v 1.8 1998/07/15 19:01:31 grubba Exp $");
 
 #ifdef _REENTRANT
 MUTEX_T pike_postgres_result_mutex;
diff --git a/src/modules/Postgres/postgres.c b/src/modules/Postgres/postgres.c
index 76118d2092a2282893821409b6d642fd6af18d50..8ab788ce54943caa4a5a60fd87cc21017c17d116 100644
--- a/src/modules/Postgres/postgres.c
+++ b/src/modules/Postgres/postgres.c
@@ -1,7 +1,7 @@
 /*
  * Postgres95 and PostgreSQL support for pike/0.5 and up
  *
- * (C) 1997 Francesco Chemolli <kinkie@comedia.it>
+ * (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
  *
  * This code is provided AS IS, and may be distributed under the terms
  * of the GNU General Public License, version 2.
@@ -62,7 +62,7 @@ static void pgdebug (char * a, ...) {}
 
 struct program * postgres_program;
 
-RCSID("$Id: postgres.c,v 1.7 1998/07/04 17:01:31 grubba Exp $");
+RCSID("$Id: postgres.c,v 1.8 1998/07/15 18:52:28 grubba Exp $");
 
 #define THIS ((struct pgres_object_data *) fp->current_storage)