diff --git a/spi.c b/spi.c
index aed2a92..86141cc 100644
--- a/spi.c
+++ b/spi.c
@@ -76,9 +76,8 @@
 {
 	unsigned int max_data = flash->mst->spi.max_data_read;
 	if (max_data == MAX_DATA_UNSPECIFIED) {
-		msg_perr("%s called, but SPI read chunk size not defined "
-			 "on this hardware. Please report a bug at "
-			 "flashrom@flashrom.org\n", __func__);
+		msg_perr("%s called, but SPI read chunk size not defined on this hardware.\n"
+			 "Please report a bug at flashrom-stable@flashrom.org\n", __func__);
 		return 1;
 	}
 	return spi_read_chunked(flash, buf, start, len, max_data);
@@ -88,9 +87,8 @@
 {
 	unsigned int max_data = flash->mst->spi.max_data_write;
 	if (max_data == MAX_DATA_UNSPECIFIED) {
-		msg_perr("%s called, but SPI write chunk size not defined "
-			 "on this hardware. Please report a bug at "
-			 "flashrom@flashrom.org\n", __func__);
+		msg_perr("%s called, but SPI write chunk size not defined on this hardware.\n"
+			 "Please report a bug at flashrom-stable@flashrom.org\n", __func__);
 		return 1;
 	}
 	return spi_write_chunked(flash, buf, start, len, max_data);
@@ -139,8 +137,8 @@
 	    !mst->multicommand ||
 	    ((mst->command == default_spi_send_command) &&
 	     (mst->multicommand == default_spi_send_multicommand))) {
-		msg_perr("%s called with incomplete master definition. "
-			 "Please report a bug at flashrom@flashrom.org\n",
+		msg_perr("%s called with incomplete master definition.\n"
+			 "Please report a bug at flashrom-stable@flashrom.org\n",
 			 __func__);
 		return ERROR_FLASHROM_BUG;
 	}