diff --git a/lib/master.pike.in b/lib/master.pike.in
index 29ae4d8cfee7e48d9a5b40e107c36b4eda063ee1..956d83d2da0e45ffb464c2b61f2468ce52652a2b 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,6 +1,6 @@
 /* -*- Pike -*-
  *	
- * $Id: master.pike.in,v 1.150 2001/03/26 16:50:16 grubba Exp $
+ * $Id: master.pike.in,v 1.151 2001/04/07 00:54:47 nilsson Exp $
  * 
  * Master-file for Pike.
  *
@@ -1505,7 +1505,7 @@ void _main(array(string) orig_argv, array(string) env)
 	function w=_static_modules.files()->_stdout->write;
 	w("Software......Pike\n"
 	  "Version......."+version()+"\n"
-	  "WWW...........http://pike.idonex.se/\n"
+	  "WWW...........http://pike.roxen.com/\n"
 	  "\n");
 
 	w("pike binary..."+_pike_file_name+"\n");
diff --git a/lib/modules/Graphics.pmod/Graph.pmod/create_bars.pike b/lib/modules/Graphics.pmod/Graph.pmod/create_bars.pike
index 095e563f575d31f8b7076b5ca5ce20b6f4558556..3ef4e33fad6e9d1dd433a42156569c4e82afc7e8 100755
--- a/lib/modules/Graphics.pmod/Graph.pmod/create_bars.pike
+++ b/lib/modules/Graphics.pmod/Graph.pmod/create_bars.pike
@@ -11,7 +11,7 @@ import Stdio;
 inherit "polyline.pike";
 inherit "create_graph.pike";
 
-constant cvs_version = "$Id: create_bars.pike,v 1.4 2000/10/12 00:42:15 nilsson Exp $";
+constant cvs_version = "$Id: create_bars.pike,v 1.5 2001/04/07 00:55:16 nilsson Exp $";
 
 /*
  * name = "BG: Create bars";
@@ -19,7 +19,7 @@ constant cvs_version = "$Id: create_bars.pike,v 1.4 2000/10/12 00:42:15 nilsson
  */
 
 /*
-These functions were written by Henrik "Hedda" Wallin (hedda@idonex.se)
+These functions were written by Henrik "Hedda" Wallin (hedda@roxen.com)
 Create_bars can draw normal bars, sumbars and normalized sumbars.
 */ 
 
diff --git a/lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike b/lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike
index c64fbda022f9ed1eaab7bdd49c0e15f1dd694730..e562b56cdea2dea1524576ecaf6173c946595e5a 100755
--- a/lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike
+++ b/lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike
@@ -10,7 +10,7 @@ import Stdio;
 
 inherit "polyline.pike";
 
-constant cvs_version = "$Id: create_graph.pike,v 1.5 2000/10/12 00:42:15 nilsson Exp $";
+constant cvs_version = "$Id: create_graph.pike,v 1.6 2001/04/07 00:55:17 nilsson Exp $";
 
 /*
  * name = "BG: Create graphs";
@@ -18,7 +18,7 @@ constant cvs_version = "$Id: create_graph.pike,v 1.5 2000/10/12 00:42:15 nilsson
  */
 
 /*
-These functions were written by Henrik "Hedda" Wallin (hedda@idonex.se)
+These functions were written by Henrik "Hedda" Wallin (hedda@roxen.com)
 Create_graph draws a graph but there are also some other functions
 used by create_pie and create_bars.
 
@@ -28,7 +28,7 @@ This was orginally a part of the Roxen module Business Graphics.
 
 object tileimage(object img, int xs, int ys)
 {
-  //written by js@idonex.se
+  //written by js@roxen.com
 
   object dest=image(xs,ys);
   int srcx=img->xsize();
diff --git a/lib/modules/Graphics.pmod/Graph.pmod/create_pie.pike b/lib/modules/Graphics.pmod/Graph.pmod/create_pie.pike
index 0f847143aa8868851584719d1794092e059f1045..5fcc945e22176f17344519ae322228483bb39dbd 100644
--- a/lib/modules/Graphics.pmod/Graph.pmod/create_pie.pike
+++ b/lib/modules/Graphics.pmod/Graph.pmod/create_pie.pike
@@ -12,7 +12,7 @@ inherit "polyline.pike";
 inherit "create_graph.pike";
 inherit "create_bars.pike";
 
-constant cvs_version = "$Id: create_pie.pike,v 1.5 2000/10/12 00:42:15 nilsson Exp $";
+constant cvs_version = "$Id: create_pie.pike,v 1.6 2001/04/07 00:55:17 nilsson Exp $";
 
 /*
  * name = "BG: Create pies";
@@ -20,7 +20,7 @@ constant cvs_version = "$Id: create_pie.pike,v 1.5 2000/10/12 00:42:15 nilsson E
  */
 
 /*
-These functions were written by Henrik "Hedda" Wallin (hedda@idonex.se)
+These functions were written by Henrik "Hedda" Wallin (hedda@roxen.com)
 Create_pie can draw pie charts in different forms.
 
 The data is taken from the diagram_data-mapping which is described in 
diff --git a/lib/modules/Protocols.pmod/TELNET.pmod b/lib/modules/Protocols.pmod/TELNET.pmod
index 41599e6c199deab934e24dba3b9f60dce7a3b840..6ff798a72b686cf33a91e57d54c887d2387faa32 100644
--- a/lib/modules/Protocols.pmod/TELNET.pmod
+++ b/lib/modules/Protocols.pmod/TELNET.pmod
@@ -1,9 +1,9 @@
 //
-// $Id: TELNET.pmod,v 1.14 2000/12/28 15:03:30 grubba Exp $
+// $Id: TELNET.pmod,v 1.15 2001/04/07 00:55:52 nilsson Exp $
 //
 // The TELNET protocol as described by RFC 764 and others.
 //
-// Henrik Grubbstr�m <grubba@idonex.se> 1998-04-04
+// Henrik Grubbstr�m <grubba@roxen.com> 1998-04-04
 //
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/Atom.pmod b/lib/modules/Protocols.pmod/X.pmod/Atom.pmod
index 5067e59d32bfcc556883dee95b2cad3bfd99951c..594a8c7182663402594671bbe8a7706a60be9b8d 100644
--- a/lib/modules/Protocols.pmod/X.pmod/Atom.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/Atom.pmod
@@ -1,6 +1,6 @@
 /* Atom.pmod
  *
- * X Atoms $Id: Atom.pmod,v 1.7 2000/09/28 03:39:04 hubbe Exp $
+ * X Atoms $Id: Atom.pmod,v 1.8 2001/04/07 00:56:31 nilsson Exp $
  *
  */
 
@@ -26,7 +26,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/Auth.pmod b/lib/modules/Protocols.pmod/X.pmod/Auth.pmod
index d9f7e7f5a0b663d0d349af6d612fe008c6db68b8..23cb2d1d61e3c58c628a3b085e460f7c07d57384 100644
--- a/lib/modules/Protocols.pmod/X.pmod/Auth.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/Auth.pmod
@@ -1,6 +1,6 @@
 /* Auth.pmod
  *
- * $Id: Auth.pmod,v 1.9 2000/09/28 03:39:05 hubbe Exp $
+ * $Id: Auth.pmod,v 1.10 2001/04/07 00:56:31 nilsson Exp $
  */
 
 /*
@@ -25,7 +25,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/Extensions.pmod b/lib/modules/Protocols.pmod/X.pmod/Extensions.pmod
index 5d8aeb56f04ddaf3ecd320270c32a29c16513f52..cbdbdd088fcabddadeb42c18be3a1d4c8832a199 100644
--- a/lib/modules/Protocols.pmod/X.pmod/Extensions.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/Extensions.pmod
@@ -1,6 +1,6 @@
 /* Shaped windows.
  *
- * $Id: Extensions.pmod,v 1.10 2000/09/28 03:39:05 hubbe Exp $
+ * $Id: Extensions.pmod,v 1.11 2001/04/07 00:56:31 nilsson Exp $
 
 /*
  *    Protocols.X, a Pike interface to the X Window System
@@ -24,7 +24,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/Requests.pmod b/lib/modules/Protocols.pmod/X.pmod/Requests.pmod
index f5620a54cb2b20feca2edc7c8f5a407c7f98d1a9..1405e660e162ba23e51747a9049ac0a80a970f27 100644
--- a/lib/modules/Protocols.pmod/X.pmod/Requests.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/Requests.pmod
@@ -1,6 +1,6 @@
 /* Requests.pike
  *
- * $Id: Requests.pmod,v 1.28 2000/09/28 03:39:05 hubbe Exp $
+ * $Id: Requests.pmod,v 1.29 2001/04/07 00:56:31 nilsson Exp $
  */
 
 /*
@@ -25,7 +25,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/Types.pmod b/lib/modules/Protocols.pmod/X.pmod/Types.pmod
index 19d5f8f8a1c13039b8feb560673289208b96e0e0..47ee4a3982e90476255d12e10147ca9d28ed05d5 100644
--- a/lib/modules/Protocols.pmod/X.pmod/Types.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/Types.pmod
@@ -1,6 +1,6 @@
 /* Types.pmod
  *
- * $Id: Types.pmod,v 1.34 2000/09/28 03:39:05 hubbe Exp $
+ * $Id: Types.pmod,v 1.35 2001/04/07 00:56:31 nilsson Exp $
  */
 
 /*
@@ -25,7 +25,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/XImage.pmod b/lib/modules/Protocols.pmod/X.pmod/XImage.pmod
index 1fa96a1af8429b1f989874791ed85c1c77c53703..10703a4d879766bad5f0eebfe97ca371e5745405 100644
--- a/lib/modules/Protocols.pmod/X.pmod/XImage.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/XImage.pmod
@@ -1,6 +1,6 @@
 /* XImage.pmod
  *
- * $Id: XImage.pmod,v 1.17 2000/10/21 06:27:32 nilsson Exp $
+ * $Id: XImage.pmod,v 1.18 2001/04/07 00:56:32 nilsson Exp $
  */
 
 /*
@@ -25,7 +25,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/XTools.pmod b/lib/modules/Protocols.pmod/X.pmod/XTools.pmod
index 7978c1cf0eced0da79e5949dce3087b1f1f80424..0e7f363e7f77ab0166c8d3f705172c2354910e86 100644
--- a/lib/modules/Protocols.pmod/X.pmod/XTools.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/XTools.pmod
@@ -1,6 +1,6 @@
 /* XTools.pmod
  *
- * $Id: XTools.pmod,v 1.6 2000/09/28 03:39:06 hubbe Exp $
+ * $Id: XTools.pmod,v 1.7 2001/04/07 00:56:32 nilsson Exp $
  *
  * Various tools that are higher level than raw X, but are lower level
  * than widgets.
@@ -28,7 +28,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/Xlib.pmod b/lib/modules/Protocols.pmod/X.pmod/Xlib.pmod
index 48ef1539582779f1e77dd52be8a66e23ebb7da4a..20689c31bad417008de6d218385b1a350a2fa51a 100644
--- a/lib/modules/Protocols.pmod/X.pmod/Xlib.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/Xlib.pmod
@@ -1,6 +1,6 @@
 /* Xlib.pmod
  *
- * $Id: Xlib.pmod,v 1.41 2000/09/28 03:39:06 hubbe Exp $
+ * $Id: Xlib.pmod,v 1.42 2001/04/07 00:56:32 nilsson Exp $
  */
 
 /*
@@ -25,7 +25,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/_Types.pmod b/lib/modules/Protocols.pmod/X.pmod/_Types.pmod
index 50f5077a70ffbd7b1d0e90ce3c25887de0b11a0a..61564f7ddc9cc54b35406486ae8dffe26aa4cb93 100644
--- a/lib/modules/Protocols.pmod/X.pmod/_Types.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/_Types.pmod
@@ -2,7 +2,7 @@
  *
  * Kludge for pike-0.5
  *
- * $Id: _Types.pmod,v 1.5 2000/09/28 03:39:06 hubbe Exp $
+ * $Id: _Types.pmod,v 1.6 2001/04/07 00:56:32 nilsson Exp $
  */
 
 /*
@@ -27,7 +27,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Protocols.pmod/X.pmod/_Xlib.pmod b/lib/modules/Protocols.pmod/X.pmod/_Xlib.pmod
index ec0397454c8df5181bb2ca603daf97fe5b9d21b6..c8da7f99137c0bd9f71d5534a2a0e65c2ca1e707 100644
--- a/lib/modules/Protocols.pmod/X.pmod/_Xlib.pmod
+++ b/lib/modules/Protocols.pmod/X.pmod/_Xlib.pmod
@@ -1,6 +1,6 @@
 /* _Xlib.pmod
  *
- * $Id: _Xlib.pmod,v 1.15 2000/09/28 03:39:06 hubbe Exp $
+ * $Id: _Xlib.pmod,v 1.16 2001/04/07 00:56:32 nilsson Exp $
  *
  * Kluge, should be in Xlib.pmod
  */
@@ -27,7 +27,7 @@
  */
 
 /* Questions, bug fixes and bug reports can be sent to the pike
- * mailing list, pike@idonex.se, or to the athors (see AUTHORS for
+ * mailing list, pike@roxen.com, or to the athors (see AUTHORS for
  * email addresses. */
 
 #pike __REAL_VERSION__
diff --git a/lib/modules/Sql.pmod/Sql.pike b/lib/modules/Sql.pmod/Sql.pike
index d52f24833d7f993843c2c65c611223ce8eece493..1e4cb6591d8de00c881b5075c8b3d73bd03d804c 100644
--- a/lib/modules/Sql.pmod/Sql.pike
+++ b/lib/modules/Sql.pmod/Sql.pike
@@ -1,5 +1,5 @@
 /*
- * $Id: Sql.pike,v 1.46 2001/01/09 21:18:29 marcus Exp $
+ * $Id: Sql.pike,v 1.47 2001/04/07 00:57:08 nilsson Exp $
  *
  * Implements the generic parts of the SQL-interface
  *
@@ -10,8 +10,8 @@
 
 //.
 //. File:	sql.pike
-//. RCSID:	$Id: Sql.pike,v 1.46 2001/01/09 21:18:29 marcus Exp $
-//. Author:	Henrik Grubbstr�m (grubba@idonex.se)
+//. RCSID:	$Id: Sql.pike,v 1.47 2001/04/07 00:57:08 nilsson Exp $
+//. Author:	Henrik Grubbstr�m (grubba@roxen.com)
 //.
 //. Synopsis:	Implements the generic parts of the SQL-interface.
 //.
diff --git a/lib/modules/Sql.pmod/mysql.pike b/lib/modules/Sql.pmod/mysql.pike
index 9ae04af7e3bb0633489ea5ca128a729716009da4..bd1ee04fa1ecd7cbdb0e3cc71b52bc7854017b16 100644
--- a/lib/modules/Sql.pmod/mysql.pike
+++ b/lib/modules/Sql.pmod/mysql.pike
@@ -1,13 +1,13 @@
 /*
- * $Id: mysql.pike,v 1.12 2000/09/28 03:39:08 hubbe Exp $
+ * $Id: mysql.pike,v 1.13 2001/04/07 00:57:09 nilsson Exp $
  *
  * Glue for the Mysql-module
  */
 
 //.
 //. File:	mysql.pike
-//. RCSID:	$Id: mysql.pike,v 1.12 2000/09/28 03:39:08 hubbe Exp $
-//. Author:	Henrik Grubbstr�m (grubba@idonex.se)
+//. RCSID:	$Id: mysql.pike,v 1.13 2001/04/07 00:57:09 nilsson Exp $
+//. Author:	Henrik Grubbstr�m (grubba@roxen.com)
 //.
 //. Synopsis:	Implements the glue to the Mysql-module.
 //.
diff --git a/lib/modules/Sql.pmod/sql_util.pmod b/lib/modules/Sql.pmod/sql_util.pmod
index f4318adb1e9bd719f66436316ab6cb916839923e..b3392c68c3f40807aea8c705a91ded7dac132bc0 100644
--- a/lib/modules/Sql.pmod/sql_util.pmod
+++ b/lib/modules/Sql.pmod/sql_util.pmod
@@ -1,5 +1,5 @@
 /*
- * $Id: sql_util.pmod,v 1.7 2001/01/09 21:18:30 marcus Exp $
+ * $Id: sql_util.pmod,v 1.8 2001/04/07 00:57:09 nilsson Exp $
  *
  * Some SQL utility functions.
  * They are kept here to avoid circular references.
@@ -11,8 +11,8 @@
 
 //.
 //. File:	sql_util.pmod
-//. RCSID:	$Id: sql_util.pmod,v 1.7 2001/01/09 21:18:30 marcus Exp $
-//. Author:	Henrik Grubbstr�m (grubba@idonex.se)
+//. RCSID:	$Id: sql_util.pmod,v 1.8 2001/04/07 00:57:09 nilsson Exp $
+//. Author:	Henrik Grubbstr�m (grubba@roxen.com)
 //.
 //. Synopsis:	Some SQL utility functions
 //.
diff --git a/src/modules/Image/encodings/bmp.c b/src/modules/Image/encodings/bmp.c
index 8ed0246380a5ebf55c9beefb3f99e7e7010c5ca2..0089cf54b5b44a36e8538e15df1ff9873039e674 100644
--- a/src/modules/Image/encodings/bmp.c
+++ b/src/modules/Image/encodings/bmp.c
@@ -1,9 +1,9 @@
-/* $Id: bmp.c,v 1.30 2000/12/01 08:10:03 hubbe Exp $ */
+/* $Id: bmp.c,v 1.31 2001/04/07 00:58:12 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: bmp.c,v 1.30 2000/12/01 08:10:03 hubbe Exp $
+**!	$Id: bmp.c,v 1.31 2001/04/07 00:58:12 nilsson Exp $
 **! submodule BMP
 **!
 **!	This submodule keeps the BMP (Windows Bitmap)
@@ -22,7 +22,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: bmp.c,v 1.30 2000/12/01 08:10:03 hubbe Exp $");
+RCSID("$Id: bmp.c,v 1.31 2001/04/07 00:58:12 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -873,12 +873,12 @@ void i_img_bmp__decode(INT32 args,int header_only)
 			   Pike_error("Image.BMP.decode: advanced RLE "
 				 "decompression (cursor movement) "
 				 "is unimplemented (please send this "
-				 "image to mirar@idonex.se)\n");
+				 "image to mirar@roxen.com)\n");
 			default: /* literal run */
 			   Pike_error("Image.BMP.decode: advanced RLE "
 				 "decompression (literal run) "
 				 "is unimplemented (please send this "
-				 "image to mirar@idonex.se)\n");
+				 "image to mirar@roxen.com)\n");
 		     }
 		     break;
 		  default:
@@ -960,7 +960,7 @@ void i_img_bmp__decode(INT32 args,int header_only)
 			   Pike_error("Image.BMP.decode: advanced RLE "
 				 "decompression (cursor movement) "
 				 "is unimplemented (please send this "
-				 "image to mirar@idonex.se)\n");
+				 "image to mirar@roxen.com)\n");
 #ifdef RLE_DEBUG
 			   if (j<2) break;
 			   fprintf(stderr,"cursor       "
@@ -973,7 +973,7 @@ void i_img_bmp__decode(INT32 args,int header_only)
 			   Pike_error("Image.BMP.decode: advanced RLE "
 				 "decompression (non-rle data) "
 				 "is unimplemented (please send this "
-				 "image to mirar@idonex.se)\n");
+				 "image to mirar@roxen.com)\n");
 #ifdef RLE_DEBUG
 			   fprintf(stderr,"data         %5d %02x %02x [ ",
 				   j,s[0],s[1]);
diff --git a/src/modules/Image/encodings/xwd.c b/src/modules/Image/encodings/xwd.c
index 8bf076b5e8314aa995bf466b6b1fa3b82468610a..d380e1169d5de23750c85b14e2be2d8ec87d9cd2 100644
--- a/src/modules/Image/encodings/xwd.c
+++ b/src/modules/Image/encodings/xwd.c
@@ -1,9 +1,9 @@
-/* $Id: xwd.c,v 1.19 2000/12/01 08:10:08 hubbe Exp $ */
+/* $Id: xwd.c,v 1.20 2001/04/07 00:58:13 nilsson Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: xwd.c,v 1.19 2000/12/01 08:10:08 hubbe Exp $
+**!	$Id: xwd.c,v 1.20 2001/04/07 00:58:13 nilsson Exp $
 **! submodule XWD
 **!
 **!	This submodule keeps the XWD (X Windows Dump) 
@@ -25,7 +25,7 @@
 #include <ctype.h>
 
 #include "stralloc.h"
-RCSID("$Id: xwd.c,v 1.19 2000/12/01 08:10:08 hubbe Exp $");
+RCSID("$Id: xwd.c,v 1.20 2001/04/07 00:58:13 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -62,7 +62,7 @@ void image_x_decode_pseudocolor(INT32 args);
 **!		PseudoColor / ZPixmap
 **!
 **!	If someone sends me files of other formats, these formats
-**!	may be implemented. <tt>:)</tt> /<tt>mirar@idonex.se</tt>
+**!	may be implemented. <tt>:)</tt> /<tt>mirar@roxen.com</tt>
 **!
 **! see also: decode
 **!
diff --git a/src/modules/Msql/doc/msql b/src/modules/Msql/doc/msql
index b5269e4a95b34f9626f239e903561fcea4c90f06..7f056666527e37e2208115eeafe386c8e1eda68b 100644
--- a/src/modules/Msql/doc/msql
+++ b/src/modules/Msql/doc/msql
@@ -422,4 +422,4 @@ COPYRIGHT
 
 	The Pike programming language is copyright Frederik Hubinette, and is
 	distributed under the terms of the GNU General Public License. For furhter
-	information, please consult the Pike WWW site, at http://pike.idonex.se/
+	information, please consult the Pike WWW site, at http://pike.roxen.com/
diff --git a/src/modules/Postgres/doc/postgres_postgres b/src/modules/Postgres/doc/postgres_postgres
index 65ba74a016f5a57ba0312660be7f78176ecfecf5..81b8136c497c277e3978c2f37640bca1e7f9a5dd 100644
--- a/src/modules/Postgres/doc/postgres_postgres
+++ b/src/modules/Postgres/doc/postgres_postgres
@@ -263,4 +263,4 @@ COPYRIGHT
 
 	The Pike programming language is copyright Frederik Hubinette, and is
 	distributed under the terms of the GNU General Public License. For furhter
-	information, please consult the Pike WWW site, at http://pike.idonex.se/
+	information, please consult the Pike WWW site, at http://pike.roxen.com/
diff --git a/src/modules/Postgres/doc/postgres_postgres_result b/src/modules/Postgres/doc/postgres_postgres_result
index aba20c280a97bbb1e725b35c80d2808e3dbaacde..cae0b83e02efd88d7465ee4437e9a2c0fd49714b 100644
--- a/src/modules/Postgres/doc/postgres_postgres_result
+++ b/src/modules/Postgres/doc/postgres_postgres_result
@@ -39,4 +39,4 @@ COPYRIGHT
 
 	The Pike programming language is copyright Frederik Hubinette, and is
 	distributed under the terms of the GNU General Public License. For furhter
-	information, please consult the Pike WWW site, at http://pike.idonex.se/
+	information, please consult the Pike WWW site, at http://pike.roxen.com/
diff --git a/src/modules/Postgres/doc/sql_postgres b/src/modules/Postgres/doc/sql_postgres
index ad8e05ca7280f3e4eaa652b1adfee2b56ab2228c..3a98da974877632b23eb9554d706593eb4ae9ded 100644
--- a/src/modules/Postgres/doc/sql_postgres
+++ b/src/modules/Postgres/doc/sql_postgres
@@ -379,4 +379,4 @@ COPYRIGHT
 
 	The Pike programming language is copyright Frederik Hubinette, and is
 	distributed under the terms of the GNU General Public License. For furhter
-	information, please consult the Pike WWW site, at http://pike.idonex.se/
+	information, please consult the Pike WWW site, at http://pike.roxen.com/
diff --git a/src/modules/Postgres/doc/sql_postgres_result b/src/modules/Postgres/doc/sql_postgres_result
index 29c73197aa471e769ffece7c71d46b182b483baf..d6ad05eb0620d01016dcb4a8367e15ec02ce7727 100644
--- a/src/modules/Postgres/doc/sql_postgres_result
+++ b/src/modules/Postgres/doc/sql_postgres_result
@@ -147,4 +147,4 @@ COPYRIGHT
 
 	The Pike programming language is copyright Frederik Hubinette, and is
 	distributed under the terms of the GNU General Public License. For furhter
-	information, please consult the Pike WWW site, at http://pike.idonex.se/
+	information, please consult the Pike WWW site, at http://pike.roxen.com/
diff --git a/src/post_modules/GTK/AUTHORS b/src/post_modules/GTK/AUTHORS
index 6772f6bbd6f9ea9cb20cc8341363780a617d3c63..fd1dbee032c1d4bffb69c16fac4dbe4c0e954be2 100644
--- a/src/post_modules/GTK/AUTHORS
+++ b/src/post_modules/GTK/AUTHORS
@@ -1,6 +1,6 @@
-PiGTK is written by Per Hedbor <per@idonex.se>
+PiGTK is written by Per Hedbor <per@roxen.com>
 
 The following people have contributed:
 Fredrik H�binette 	<hubbe@hubbe.net>
 David Hedbor		<david@hedbor.org>
-Peter bortas		<peter@idonex.se>
\ No newline at end of file
+Peter bortas		<peter@roxen.com>
\ No newline at end of file
diff --git a/tutorial/tutorial.wmml b/tutorial/tutorial.wmml
index 33fdc0e7a9f4c4ca7608ce12888e1197761e1913..c341bda089dfed212f14e14f62c85fb1382be73d 100644
--- a/tutorial/tutorial.wmml
+++ b/tutorial/tutorial.wmml
@@ -181,7 +181,7 @@ write this book, but since it seems impossible without paying a fortune for
 it I will have to do it myself. 
 A big thanks goes to
 <a href="http://www.emit.com.pl/ian.html">Ian Carr-de Avelon</a> and
-<a href="mailto:hedda@idonex.se">Henrik Wallin</a>
+<a href="mailto:hedda@roxen.com">Henrik Wallin</a>
  for helping
 me iron out some of the rough spots. 
 
@@ -12699,7 +12699,7 @@ init_module_programs are called to initialize it. When Pike exits
 exit_module is called in all dynamically loaded modules. These
 functions _must_ be available in the module.
 <p>Please see the source and any examples available at
-ftp://www.idonex.se/pub/pike for more information on how to
+ftp://www.roxen.com/pub/pike for more information on how to
 write modules for Pike in C.
 </man_description>
 <man_bugs>
@@ -14701,7 +14701,7 @@ This is the BNF for Pike:
 <appendix title="How to install Pike" name=install>
 To install Pike, you need a C compiler, a couple of Mb of disk space,
 the source for Pike, and a bit of patience. The latest version of Pike is
-always available from <a href=http://pike.idonex.se>the Pike home page</a>.
+always available from <a href=http://pike.roxen.com>the Pike home page</a>.
 Lists of mirror sites and binary releases should also be available there.
 Pike should compile and install nicely on almost any UNIX platform. It has
 been tested on the following: