diff --git a/README b/README
index 3bdeb9d..9f21c21 100644
--- a/README
+++ b/README
@@ -122,5 +122,5 @@
 
 The official flashrom website is:
 
-  http://coreboot.org/Flashrom
+  http://www.flashrom.org/
 
diff --git a/flashrom.8 b/flashrom.8
index b64ae6d..9089123 100644
--- a/flashrom.8
+++ b/flashrom.8
@@ -133,7 +133,7 @@
 Same as
 .BR \-\-list\-supported ,
 but outputs the supported hardware in MediaWiki syntax, so that it can be
-easily pasted into the wiki page at http://coreboot.org/Flashrom.
+easily pasted into the wiki page at http://www.flashrom.org/.
 .TP
 .B "\-p, \-\-programmer <name>"
 Specify the programmer device. Currently supported are:
@@ -217,9 +217,9 @@
 (/dev/xsvc on Solaris) can not be opened and with 3 if a call to mmap() fails.
 .SH BUGS
 Please report any bugs at
-.BR http://tracker.coreboot.org/trac/coreboot/newticket ","
-or on the coreboot mailing list
-.RB "(" http://coreboot.org/Mailinglist ")."
+.BR http://www.flashrom.org/trac/flashrom/newticket ","
+or on the flashrom mailing list
+.RB "(" http://www.flashrom.org/mailman/listinfo/flashrom ")."
 .SH LICENCE
 .B flashrom
 is covered by the GNU General Public License (GPL), version 2. Some files are
diff --git a/flashrom.c b/flashrom.c
index cb0da72..12b4e46 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -780,7 +780,7 @@
 				printf(" WRITE");
 			printf("\n");
 		}
-		printf("Please email a report to flashrom@coreboot.org if any "
+		printf("Please email a report to flashrom@flashrom.org if any "
 		       "of the above operations\nwork correctly for you with "
 		       "this flash part. Please include the flashrom\noutput "
 		       "with the additional -V option for all operations you "
diff --git a/pcidev.c b/pcidev.c
index ccbcba7..bc8dbc7 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -51,7 +51,7 @@
 		if (devs[i].status == PCI_NT) {
 			printf("===\nThis PCI device is UNTESTED. Please "
 			       "report the 'flashrom -p xxxx' output \n"
-			       "to flashrom@coreboot.org if it works "
+			       "to flashrom@flashrom.org if it works "
 			       "for you. Thank you for your help!\n===\n");
 		}