diff --git a/doc/mboxgrep.1 b/doc/mboxgrep.1
index a596ef3..f49db78 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@datatipp.se>
+Daniel Spiljar <dspiljar AT datatipp.se>
diff --git a/src/mboxgrep.h b/src/mboxgrep.h
index b38ccea..36d0e67 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@datatipp.se"
+#define BUGREPORT_ADDR "dspiljar AT datatipp.se"
 
 #define HOST_NAME_SIZE 256