diff --git a/README b/README
index b13d1a7..a272080 100644
--- a/README
+++ b/README
@@ -22,30 +22,10 @@
 * zlib-devel / zlib1g-dev
 
 
-Usage
------
+Usage / Options
+---------------
 
- $ flashrom [-rwvEVfLhR] [-c chipname] [-s exclude_start] [-e exclude_end]
-            [-m [vendor:]part] [-l file.layout] [-i imagename] [file]
-   -r | --read:                      read flash and save into file
-   -w | --write:                     write file into flash (default when
-                                     file is specified)
-   -v | --verify:                    verify flash against file
-   -E | --erase:                     erase flash device
-   -V | --verbose:                   more verbose output
-   -c | --chip <chipname>:           probe only for specified flash chip
-   -s | --estart <addr>:             exclude start position
-   -e | --eend <addr>:               exclude end postion
-   -m | --mainboard <[vendor:]part>: override mainboard settings
-   -f | --force:                     force write without checking image
-   -l | --layout <file.layout>:      read rom layout from file
-   -i | --image <name>:              only flash image name from flash layout
-   -L | --list-supported:            print supported devices
-   -h | --help:                      print this help text
-   -R | --version:                   print the version (release)
-
- If no file is specified, then all that happens
- is that flash info is dumped and the flash chip is set to writable.
+Please see the flashrom(8) manpage.
 
 
 Exit status
diff --git a/layout.c b/layout.c
index 84a8ec7..87a52ad 100644
--- a/layout.c
+++ b/layout.c
@@ -108,8 +108,7 @@
 	 */
 	if (!strcasecmp(mainboard_vendor, lb_vendor) &&
 	    !strcasecmp(mainboard_part, lb_part)) {
-		printf_debug("This firmware image matches "
-			     "this motherboard.\n");
+		printf_debug("This firmware image matches this mainboard.\n");
 	} else {
 		if (force) {
 			printf("WARNING: This firmware image does not "