Index: cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
===================================================================
--- cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -5851,11 +5851,19 @@
 
 	if (cb.cb_poolname[0] != '\0') {
 		(void) printf(
-		    "If you boot from pool '%s', don't forget to update boot code.\n"
-		    "Assuming you use GPT partitioning and da0 is your boot disk\n"
-		    "the following command will do it:\n"
+		    "If you boot from the '%s' pool, don't forget to update "
+		    "the boot code.\n"
+		    "Assuming da0 is your boot disk:\n"
+		    "\tgpart show da0\n\n"
+		    "For legacy/BIOS boot using GPT partitioning update the "
+		    "'freebsd-boot' type partition.\n"
 		    "\n"
-		    "\tgpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 da0\n\n",
+		    "\tgpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 2 "
+		    "da0\n\n"
+		    "Or for UEFI, update the 'efi' type partition.\n"
+		    "\n"
+		    "\tgpart bootcode -p /boot/boot1.efifat -i 1 da0\n\n"
+		    "Make sure the -i <index> parameter is correct\n\n",
 		    cb.cb_poolname);
 	}
 
Index: cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
===================================================================
--- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
@@ -2880,14 +2880,16 @@
 			    "before rebooting.\n"));
 			(void) fprintf(stderr, "\n");
 			(void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If "
-			    "you boot from pool '%s', you may need to update\n"
-			    "boot code on newly attached disk '%s'.\n\n"
-			    "Assuming you use GPT partitioning and 'da0' is "
-			    "your new boot disk\n"
-			    "you may use the following command:\n\n"
+			    "you boot from the '%s' pool, you may need to "
+			    "update boot code on newly attached disk '%s'.\n\n"
+			    "For legacy/BIOS boot using GPT partitioning "
+			    "update the 'freebsd-boot' type partition.\n\n"
 			    "\tgpart bootcode -b /boot/pmbr -p "
-			    "/boot/gptzfsboot -i 1 da0\n\n"),
-			    zhp->zpool_name, new_disk);
+			    "/boot/gptzfsboot -i 2 %s\n\n"
+			    "Or for UEFI, update the 'efi' type partition.\n\n"
+			    "\tgpart bootcode -p /boot/boot1.efifat -i 1 %s\n\n"
+			    "Make sure the -i <index> parameter is correct\n\n",
+			    zhp->zpool_name, new_disk, new_disk, new_disk);
 		}
 		return (0);
 	}