Index: sys/dev/ixgbe/if_ix.c
===================================================================
--- sys/dev/ixgbe/if_ix.c
+++ sys/dev/ixgbe/if_ix.c
@@ -4701,20 +4701,23 @@
 	status = ixgbe_get_phy_firmware_version(hw, &phyfw);
 
 	if (nvm_ver.oem_valid)
-		sbuf_printf(buf, "NVM OEM V%d.%d R%d ", nvm_ver.oem_major,
+		sbuf_printf(buf, "NVM OEM V%d.%d R%d", nvm_ver.oem_major,
 		    nvm_ver.oem_minor, nvm_ver.oem_release);
 
 	if (nvm_ver.or_valid)
-		sbuf_printf(buf, "Option ROM V%d-b%d-p%d ", nvm_ver.or_major,
-		    nvm_ver.or_build, nvm_ver.or_patch);
+		sbuf_printf(buf, "%sOption ROM V%d-b%d-p%d",
+		    nvm_ver.oem_valid ? " " : "",
+		    nvm_ver.or_major, nvm_ver.or_build, nvm_ver.or_patch);
 
 	if (nvm_ver.etk_id != ((NVM_VER_INVALID << NVM_ETK_SHIFT) | NVM_VER_INVALID))
-		sbuf_printf(buf, "eTrack 0x%08x ", nvm_ver.etk_id);
+		sbuf_printf(buf, "%seTrack 0x%08x",
+		    (nvm_ver.oem_valid || nvm_ver.or_valid) ? " " : "",
+		    nvm_ver.etk_id);
 
 	if (phyfw != 0 && status == IXGBE_SUCCESS)
-		sbuf_printf(buf, "PHY FW V%d ", phyfw);
-
-	sbuf_trim(buf);
+		sbuf_printf(buf, "%sPHY FW V%d ",
+		    (nvm_ver.oem_valid || nvm_ver.or_valid || nvm_ver.etk_id) ? " " : "",
+		    phyfw);
 } /* ixgbe_sbuf_fw_version */
 
 /************************************************************************