diff --git a/drivers/md/md-autodetect.c b/drivers/md/md-autodetect.c
index b2a00f213c2c..6bd6e9177969 100644
--- a/drivers/md/md-autodetect.c
+++ b/drivers/md/md-autodetect.c
@@ -124,6 +124,17 @@ static void __init md_setup_drive(struct md_setup_args *args)
 	struct mddev *mddev;
 	int err = 0, i;
 	char name[16];
+	int major_version = 0, minor_version = 90;
+	char *pp;
+	static struct {
+		char *metadata;
+		int major_version;
+		int minor_version;
+	} metadata_table[] =
+		{{"0.90", 0, 90},
+		 {"1.0", 1, 0},
+		 {"1.1", 1, 1},
+		 {"1.2", 1, 2}};
 
 	if (args->partitioned) {
 		mdev = MKDEV(mdp_major, args->minor << MdpMinorShift);
@@ -133,6 +144,21 @@ static void __init md_setup_drive(struct md_setup_args *args)
 		sprintf(name, "md%d", args->minor);
 	}
 
+	pp = strchr(devname, ',');
+	if (pp)
+	{
+		*pp = 0;
+		for (i = 0; i < ARRAY_SIZE(metadata_table); i++)
+			if (!strcmp(devname, metadata_table[i].metadata))
+			{
+				major_version = metadata_table[i].major_version;
+				minor_version = metadata_table[i].minor_version;
+				devname = pp + 1;
+				break;
+			}
+		*pp = ',';
+	}
+
 	for (i = 0; i < MD_SB_DISKS && devname != NULL; i++) {
 		struct kstat stat;
 		char *p;
@@ -183,6 +209,8 @@ static void __init md_setup_drive(struct md_setup_args *args)
 		goto out_unlock;
 	}
 
+	ainfo.major_version = major_version;
+	ainfo.minor_version = minor_version;
 	if (args->level != LEVEL_NONE) {
 		/* non-persistent */
 		ainfo.level = args->level;