diff --git a/Geometry.cs b/Geometry.cs
index 94af1cf..94af626 100644
--- a/Geometry.cs
+++ b/Geometry.cs
@@ -50,6 +50,7 @@ namespace Aaru.CommonTypes
                 (32, 1, 8, 319, MediaEncoding.FM, false, MediaType.IBM23FD),
                 (35, 1, 9, 256, MediaEncoding.FM, false, MediaType.ECMA_66),
                 (35, 1, 13, 256, MediaEncoding.AppleGCR, false, MediaType.Apple32SS),
+                (35, 1, 16, 256, MediaEncoding.MFM, false, MediaType.MetaFloppy_Mod_I),
                 (35, 1, 16, 256, MediaEncoding.AppleGCR, false, MediaType.Apple33SS),
                 (35, 1, 19, 256, MediaEncoding.CommodoreGCR, false, MediaType.CBM_1540),
                 (35, 2, 13, 256, MediaEncoding.AppleGCR, false, MediaType.Apple32DS),
@@ -75,7 +76,7 @@ namespace Aaru.CommonTypes
                 (74, 2, 15, 512, MediaEncoding.MFM, false, MediaType.IBM53FD_512),
                 (74, 2, 26, 128, MediaEncoding.FM, false, MediaType.IBM43FD_128),
                 (74, 2, 26, 256, MediaEncoding.MFM, false, MediaType.IBM53FD_256),
-                (77, 1, 16, 256, MediaEncoding.MFM, false, MediaType.MetaFloppy),
+                (77, 1, 16, 256, MediaEncoding.MFM, false, MediaType.MetaFloppy_Mod_II),
                 (77, 1, 26, 128, MediaEncoding.FM, false, MediaType.RX01),
                 (77, 1, 26, 256, MediaEncoding.MFM, false, MediaType.RX02),
                 (77, 2, 8, 1024, MediaEncoding.MFM, false, MediaType.NEC_525_HD),
diff --git a/MediaType.cs b/MediaType.cs
index 140b52a..c055e26 100644
--- a/MediaType.cs
+++ b/MediaType.cs
@@ -807,7 +807,7 @@ namespace Aaru.CommonTypes
         Floptical = 662, HiFD = 663, QuickDisk = 664, UHD144       = 665,
         VideoFloppy           = 666, Wafer     = 667, ZXMicrodrive = 668,
         /// <summary>5.25", SS, DD, 77 tracks, 16 spt, 256 bytes/sector, MFM, 100 tpi, 300rpm</summary>
-        MetaFloppy = 669,
+        MetaFloppy_Mod_II = 669,
         #endregion Other floppy standards, types 660 to 669
 
         #region Miscellaneous, types 670 to 689
@@ -1036,5 +1036,10 @@ namespace Aaru.CommonTypes
         /// <summary>3,5", M.O., 1041500 sectors, 512 bytes/sector, ISO 15041, 540Mb/cart</summary>
         ISO_15041_512 = 804,
         #endregion Magneto-optical, types 800 to 819
+
+        #region More floppy formats, types 820 to deprecated
+        /// <summary>5.25", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm</summary>
+        MetaFloppy_Mod_I = 820,
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/MediaType.csv b/MediaType.csv
index 89a8d83..cb1b337 100644
--- a/MediaType.csv
+++ b/MediaType.csv
@@ -441,7 +441,7 @@ Enum,Value,Summary
 "VideoFloppy",666,
 "Wafer",667,
 "ZXMicrodrive",668,
-"MetaFloppy",669,"5.25"", SS, DD, 77 tracks, 16 spt, 256 bytes/sector, MFM, 100 tpi, 300rpm"
+"MetaFloppy_Mod_II",669,"5.25"", SS, DD, 77 tracks, 16 spt, 256 bytes/sector, MFM, 100 tpi, 300rpm"
 "BeeCard",670,
 "Borsu",671,
 "DataStore",672,
@@ -529,3 +529,4 @@ Enum,Value,Summary
 "ISO_14517",802,"5,25"", M.O., 1273011 sectors, 1024 bytes/sector, ISO 14517, 2.6Gb/cart"
 "ISO_14517_512",803,"5,25"", M.O., 2244958 sectors, 512 bytes/sector, ISO 14517, 2.3Gb/cart"
 "ISO_15041_512",804,"3,5"", M.O., 1041500 sectors, 512 bytes/sector, ISO 15041, 540Mb/cart"
+"MetaFloppy_Mod_I",820,"5.25"", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm"
\ No newline at end of file
diff --git a/MediaTypeFromDevice/FromSbc.cs b/MediaTypeFromDevice/FromSbc.cs
index c4ffe72..907d7de 100644
--- a/MediaTypeFromDevice/FromSbc.cs
+++ b/MediaTypeFromDevice/FromSbc.cs
@@ -308,7 +308,7 @@ namespace Aaru.CommonTypes
                                                        "SCSI medium type is {0:X2}h, media has {1} blocks of {2} bytes, setting media type to MetaFloppy formatted 5¼\" double density single sided floppy.",
                                                        mediumType, blocks, blockSize);
 
-                            return MediaType.MetaFloppy;
+                            return MediaType.MetaFloppy_Mod_II;
                         case 1280 when mediumType == 0x01:
                             AaruConsole.DebugWriteLine("Media detection",
                                                        "SCSI medium type is {0:X2}h, media has {1} blocks of {2} bytes, setting media type to Acorn formatted 5¼\" double density floppy with 80 tracks.",
diff --git a/Metadata/Dimensions.cs b/Metadata/Dimensions.cs
index 0ffda6d..296750e 100644
--- a/Metadata/Dimensions.cs
+++ b/Metadata/Dimensions.cs
@@ -87,7 +87,8 @@ namespace Aaru.CommonTypes.Metadata
                 case CommonTypes.MediaType.ECMA_99_26:
                 case CommonTypes.MediaType.FDFORMAT_525_DD:
                 case CommonTypes.MediaType.FDFORMAT_525_HD:
-                case CommonTypes.MediaType.MetaFloppy:
+                case CommonTypes.MediaType.MetaFloppy_Mod_I:
+                case CommonTypes.MediaType.MetaFloppy_Mod_II:
                     // According to ECMA-99 et al
                     dmns.Height          = 133.3;
                     dmns.HeightSpecified = true;
diff --git a/Metadata/MediaType.cs b/Metadata/MediaType.cs
index 0ec5785..6bfba25 100644
--- a/Metadata/MediaType.cs
+++ b/Metadata/MediaType.cs
@@ -2536,9 +2536,14 @@ namespace Aaru.CommonTypes.Metadata
                     discSubType = "ODC5500R";
 
                     break;
-                case CommonTypes.MediaType.MetaFloppy:
+                case CommonTypes.MediaType.MetaFloppy_Mod_I:
                     discType    = "5.25\" floppy";
-                    discSubType = "Micropolis MetaFloppy";
+                    discSubType = "Micropolis MetaFloppy Mod I";
+
+                    break;
+                case CommonTypes.MediaType.MetaFloppy_Mod_II:
+                    discType    = "5.25\" floppy";
+                    discSubType = "Micropolis MetaFloppy Mod II";
 
                     break;
                 default: