diff --git a/mcrcon.1 b/mcrcon.1
index 480a50e..39ccf49 100644
--- a/mcrcon.1
+++ b/mcrcon.1
@@ -60,4 +60,4 @@ Send three commands to server (say, save-all and stop)
 \fBmcrcon\fR -H my.minecraft.server -p password "say Server is restarting!" save-all stop
 .RE
 .SH BUGS
-Bugs can be reported to \fBtiiffi_at_gmail_dot_com\fR or \fBhttps://github.com/Tiiffi/mcrcon/issues/\fR
+Bugs can be reported to \fBtiiffi+mcrcon at gmail\fR or \fBhttps://github.com/Tiiffi/mcrcon/issues/\fR
diff --git a/mcrcon.c b/mcrcon.c
index 9c1a71b..fdd32c8 100644
--- a/mcrcon.c
+++ b/mcrcon.c
@@ -258,7 +258,7 @@ void usage(void)
 	puts("Command-line options will override environment variables.");
 	puts("Rcon commands with arguments must be enclosed in quotes.\n");
 	puts("Example:\n\t"IN_NAME" -H my.minecraft.server -p password \"say Server is restarting!\" save-all stop\n");
-	puts(VER_STR"\nReport bugs to tiiffi_at_gmail_dot_com or https://github.com/Tiiffi/mcrcon/issues/\n");
+	puts(VER_STR"\nReport bugs to tiiffi+mcrcon at gmail or https://github.com/Tiiffi/mcrcon/issues/\n");
 
 	#ifdef _WIN32
 	    puts("Press enter to exit.");