diff --git a/sbin/atacontrol/atacontrol.c b/sbin/atacontrol/atacontrol.c
index cf5b350d9280..529ba4393dd3 100644
--- a/sbin/atacontrol/atacontrol.c
+++ b/sbin/atacontrol/atacontrol.c
@@ -175,6 +175,10 @@ cap_print(struct ata_params *parm)
 	printf("heads                 %d\n", parm->heads);
 	printf("sectors/track         %d\n", parm->sectors);
 
+	if (parm->config == ATA_PROTO_CFA ||
+	    (parm->support.command2 & ATA_SUPPORT_CFA))
+		printf("CFA supported\n");
+
 	printf("lba%ssupported         ",
 		parm->capabilities1 & ATA_SUPPORT_LBA ? " " : " not ");
 	if (lbasize)
@@ -237,10 +241,6 @@ cap_print(struct ata_params *parm)
 		parm->support.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no",
 		parm->enabled.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no");
 
-	printf("(compact) flash commands       %s	%s\n",
-		parm->support.command2 & ATA_SUPPORT_CFA ? "yes" : "no",
-		parm->enabled.command2 & ATA_SUPPORT_CFA ? "yes" : "no");
-
 	printf("advanced power management      %s	%s	%d/0x%02X\n",
 		parm->support.command2 & ATA_SUPPORT_APM ? "yes" : "no",
 		parm->enabled.command2 & ATA_SUPPORT_APM ? "yes" : "no",