diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h
--- a/sys/dev/mpi3mr/mpi3mr.h
+++ b/sys/dev/mpi3mr/mpi3mr.h
@@ -556,8 +556,7 @@
 	uint32_t chain_frame_size;
 	struct sysctl_ctx_list sysctl_ctx;
 	struct sysctl_oid *sysctl_tree;
-	char fw_version[16];
-	char msg_version[8];
+	char fw_version[32];
 	struct mpi3mr_chain *chains;
 	struct callout periodic;
 	struct callout device_check_callout;
diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c
--- a/sys/dev/mpi3mr/mpi3mr.c
+++ b/sys/dev/mpi3mr/mpi3mr.c
@@ -2240,6 +2240,10 @@
 	mpi3mr_dprint(sc, MPI3MR_INFO, "FW Version: %d.%d.%d.%d.%05d-%05d\n",
 		      fwver->gen_major, fwver->gen_minor, fwver->ph_major,
 		      fwver->ph_minor, fwver->cust_id, fwver->build_num);
+	snprintf(sc->fw_version, sizeof(sc->fw_version),
+	    "%d.%d.%d.%d.%05d-%05d",
+	    fwver->gen_major, fwver->gen_minor, fwver->ph_major,
+	    fwver->ph_minor, fwver->cust_id, fwver->build_num);
 
         mpi3mr_dprint(sc, MPI3MR_INFO, "Protocol=(");
 
diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c
--- a/sys/dev/mpi3mr/mpi3mr_pci.c
+++ b/sys/dev/mpi3mr/mpi3mr_pci.c
@@ -145,6 +145,10 @@
 	    OID_AUTO, "io_cmds_highwater", CTLFLAG_RD,
 	    &sc->io_cmds_highwater, 0, "Max FW outstanding commands");
 
+	SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
+	    OID_AUTO, "firmware_version", CTLFLAG_RD, sc->fw_version,
+	    strlen(sc->fw_version), "firmware version");
+
 	SYSCTL_ADD_UINT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
 	    OID_AUTO, "mpi3mr_debug", CTLFLAG_RW, &sc->mpi3mr_debug, 0,
 	    "Driver debug level");