Index: sys/geom/geom_map.c
===================================================================
--- sys/geom/geom_map.c
+++ sys/geom/geom_map.c
@@ -153,8 +153,8 @@
 		return (1);
 
 	if (bootverbose) {
-		printf("MAP: search key \"%s\" from 0x%jx, step 0x%jx\n",
-		    search_key, (intmax_t)search_start, (intmax_t)search_step);
+		printf("MAP: search %s for key \"%s\" from 0x%jx, step 0x%jx\n",
+		    cp->geom->name, search_key, (intmax_t)search_start, (intmax_t)search_step);
 	}
 
 	/* error if search_key is empty */
@@ -321,9 +321,9 @@
 	}
 
 	if (bootverbose) {
-		printf("MAP: %jxx%jx, data=%jxx%jx "
+		printf("MAP: %s: %jxx%jx, data=%jxx%jx "
 		    "\"/dev/map/%s\"\n",
-		    (intmax_t)start, (intmax_t)size, (intmax_t)offset,
+		    cp->geom->name, (intmax_t)start, (intmax_t)size, (intmax_t)offset,
 		    (intmax_t)dsize, name);
 	}