diff --git a/README b/README
index b57bd97..74daa49 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ which is provided both in manpage and texinfo format, to satisfy
 believers of both religions.
 
 The author of mboxgrep is Daniel Spiljar, who can be reached via email
-at <dspiljar@panix.com>.  Bug reports, feature requests and flames
+at <dspiljar@datatipp.se>.  Bug reports, feature requests and flames
 are welcome.
 
 If you intend to bundle mboxgrep with an operating system (such as a
diff --git a/doc/mboxgrep.1 b/doc/mboxgrep.1
index 6084ebe..a596ef3 100644
--- a/doc/mboxgrep.1
+++ b/doc/mboxgrep.1
@@ -119,4 +119,4 @@ well, little friend.
 .SH URL
 http://www.mboxgrep.org/
 .SH AUTHOR
-Daniel Spiljar <dspiljar@panix.com>
+Daniel Spiljar <dspiljar@datatipp.se>
diff --git a/doc/mboxgrep.info b/doc/mboxgrep.info
index 333b9c6..6b2b233 100644
Binary files a/doc/mboxgrep.info and b/doc/mboxgrep.info differ
diff --git a/doc/mboxgrep.texi b/doc/mboxgrep.texi
index e62a4d0..f523b30 100644
--- a/doc/mboxgrep.texi
+++ b/doc/mboxgrep.texi
@@ -260,7 +260,7 @@ mboxgrep -nd -c . spam
 Shortly, if @code{mboxgrep} crashes and/or works differently than described
 in this manual, you've found a bug.
 
-Please report bugs to @email{dspiljar@@panix.com}.  
+Please report bugs to @email{dspiljar@@datatipp.se}.  
 Instructions how to reproduce the bug or output from a debugger would be 
 highly appreciated. Don't, however, send any coredumps.
 
diff --git a/mboxgrep.lsm b/mboxgrep.lsm
index 8e13bce..4d2ad8d 100644
--- a/mboxgrep.lsm
+++ b/mboxgrep.lsm
@@ -10,8 +10,8 @@ Description:    mboxgrep is a small utility that scans a mailbox for messages
                 It supports mbox (both plain and compressed), MH, nnmh, nnml 
 		and maildir folders.
 Keywords:       mail, mail-tools, mbox, MH, nnmh, nnml, maildir, regex
-Author:         dspiljar@panix.com (Daniel Spiljar)
-Maintained-by:  dspiljar@panix.com (Daniel Spiljar)
+Author:         dspiljar@datatipp.se (Daniel Spiljar)
+Maintained-by:  dspiljar@datatipp.se (Daniel Spiljar)
 Primary-site:   http://www.mboxgrep.org/
                 75k     mboxgrep-0.7.9.tar.gz
 Alternate-site: 
diff --git a/src/mboxgrep.h b/src/mboxgrep.h
index 4d88626..07518cd 100644
--- a/src/mboxgrep.h
+++ b/src/mboxgrep.h
@@ -23,7 +23,7 @@
 
 #define APPNAME "mboxgrep"
 #define VERSION "0.7.10"
-#define BUGREPORT_ADDR "dspiljar@panix.com"
+#define BUGREPORT_ADDR "dspiljar@datatipp.se"
 
 #define HOST_NAME_SIZE 256