diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
index c131a9184..681942886 100644
--- a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
+++ b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Aaru" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru/bin/Debug/netcoreapp3.1/aaru.dll" />
-    <option name="PROGRAM_PARAMETERS" value="dev list" />
+    <option name="PROGRAM_PARAMETERS" value="media info /dev/sr0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Aaru/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index dd856a397..d822ad359 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit dd856a397f5cbbaeddddf8f7914492ec64ef28bf
+Subproject commit d822ad3596f95d16d566583a143e641acf58157c
diff --git a/Aaru.Core/Devices/Report/MMC.cs b/Aaru.Core/Devices/Report/MMC.cs
index d7053b2b2..20073326d 100644
--- a/Aaru.Core/Devices/Report/MMC.cs
+++ b/Aaru.Core/Devices/Report/MMC.cs
@@ -758,6 +758,7 @@ namespace Aaru.Core.Devices.Report
                 case "Ultra HD Blu-ray movie":
                 case "PlayStation 3 game":
                 case "PlayStation 4 game":
+                case "PlayStation 5 game":
                 case "Xbox One game":
                 case "Nintendo Wii U game":
                     AaruConsole.WriteLine("Querying BD BCA...");
@@ -916,6 +917,7 @@ namespace Aaru.Core.Devices.Report
                mediaType == "Ultra HD Blu-ray movie"                  ||
                mediaType == "PlayStation 3 game"                      ||
                mediaType == "PlayStation 4 game"                      ||
+               mediaType == "PlayStation 5 game"                      ||
                mediaType == "Xbox One game"                           ||
                mediaType == "Nintendo Wii game")
             {
diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs
index 29ed10ed7..abe4a7cf3 100644
--- a/Aaru.Core/Media/Detection/MMC.cs
+++ b/Aaru.Core/Media/Detection/MMC.cs
@@ -71,6 +71,11 @@ namespace Aaru.Core.Media.Detection
             0x50, 0x6C, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x34, 0x00, 0x00, 0x00, 0x00
         };
 
+        static readonly byte[] _ps5Id =
+        {
+            0x50, 0x6C, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x35, 0x00, 0x00, 0x00, 0x00
+        };
+
         static readonly byte[] _operaId =
         {
             0x01, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x01
@@ -2322,6 +2327,22 @@ namespace Aaru.Core.Media.Detection
 
                             // TODO: PS5
                             case "BDU":
+                                if(sector1 != null)
+                                {
+                                    byte[] tmp = new byte[_ps5Id.Length];
+                                    Array.Copy(sector1, 1024, tmp, 0, tmp.Length);
+
+                                    if(tmp.SequenceEqual(_ps5Id))
+                                    {
+                                        mediaType = MediaType.PS5BD;
+
+                                        AaruConsole.DebugWriteLine("Media detection",
+                                                                   "Found Sony PlayStation 5 boot sectors, setting disc type to PS5 Ultra HD Blu-ray.");
+
+                                        break;
+                                    }
+                                }
+
                                 AaruConsole.DebugWriteLine("Media detection",
                                                            "Blu-ray type set to \"BDU\", setting disc type to Ultra HD Blu-ray.");
 
diff --git a/Aaru.Images/AaruFormat/Helpers.cs b/Aaru.Images/AaruFormat/Helpers.cs
index 37a74136b..1b931331e 100644
--- a/Aaru.Images/AaruFormat/Helpers.cs
+++ b/Aaru.Images/AaruFormat/Helpers.cs
@@ -207,6 +207,7 @@ namespace Aaru.DiscImages
                 case MediaType.PS3DVD:
                 case MediaType.PS3BD:
                 case MediaType.PS4BD:
+                case MediaType.PS5BD:
                 case MediaType.UMD:
                 case MediaType.XGD:
                 case MediaType.XGD2:
diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs
index 8bb87a4c6..840c54935 100644
--- a/Aaru.Images/Alcohol120/Properties.cs
+++ b/Aaru.Images/Alcohol120/Properties.cs
@@ -153,11 +153,12 @@ namespace Aaru.DiscImages
             MediaType.DVDRWDL, MediaType.EVD, MediaType.FDDVD, MediaType.DTSCD, MediaType.FVD, MediaType.HDDVDR,
             MediaType.HDDVDRAM, MediaType.HDDVDRDL, MediaType.HDDVDROM, MediaType.HDDVDRW, MediaType.HDDVDRWDL,
             MediaType.HDVMD, MediaType.HVD, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD,
-            MediaType.PS2DVD, MediaType.PS3BD, MediaType.PS3DVD, MediaType.PS4BD, MediaType.SuperCDROM2, MediaType.SVCD,
-            MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM,
-            MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV,
-            MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD,
-            MediaType.VideoNow, MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD
+            MediaType.PS2DVD, MediaType.PS3BD, MediaType.PS3DVD, MediaType.PS4BD, MediaType.PS5BD,
+            MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO,
+            MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD,
+            MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin,
+            MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, MediaType.VideoNowColor, MediaType.VideoNowXp,
+            MediaType.CVD, MediaType.PCD
         };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
             new (string name, Type type, string description, object @default)[]
diff --git a/Aaru.Images/CDRWin/Helpers.cs b/Aaru.Images/CDRWin/Helpers.cs
index 2aec298a0..d35b3ef0f 100644
--- a/Aaru.Images/CDRWin/Helpers.cs
+++ b/Aaru.Images/CDRWin/Helpers.cs
@@ -181,6 +181,7 @@ namespace Aaru.DiscImages
                 case MediaType.CBHD:
                 case MediaType.PS3BD:
                 case MediaType.PS4BD:
+                case MediaType.PS5BD:
                 case MediaType.UDO:
                 case MediaType.UDO2:
                 case MediaType.UDO2_WORM: return CDRWIN_DISK_TYPE_BD;
diff --git a/Aaru.Images/CDRWin/Properties.cs b/Aaru.Images/CDRWin/Properties.cs
index f34d9e6cd..f0404e236 100644
--- a/Aaru.Images/CDRWin/Properties.cs
+++ b/Aaru.Images/CDRWin/Properties.cs
@@ -207,7 +207,7 @@ namespace Aaru.DiscImages
             MediaType.DTSCD, MediaType.FVD, MediaType.HDDVDR, MediaType.HDDVDRAM, MediaType.HDDVDRDL,
             MediaType.HDDVDROM, MediaType.HDDVDRW, MediaType.HDDVDRWDL, MediaType.HDVMD, MediaType.HVD,
             MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD, MediaType.PS2DVD, MediaType.PS3BD,
-            MediaType.PS3DVD, MediaType.PS4BD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD,
+            MediaType.PS3DVD, MediaType.PS4BD, MediaType.PS5BD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD,
             MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD,
             MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32,
             MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs
index a449dbc43..85c308442 100644
--- a/Aaru/Commands/Device/DeviceReport.cs
+++ b/Aaru/Commands/Device/DeviceReport.cs
@@ -607,6 +607,7 @@ namespace Aaru.Commands.Device
                                                         mediaTypes.Add("Ultra HD Blu-ray movie");
                                                         mediaTypes.Add("PlayStation 3 game");
                                                         mediaTypes.Add("PlayStation 4 game");
+                                                        mediaTypes.Add("PlayStation 5 game");
                                                         mediaTypes.Add("Xbox One game");
                                                         mediaTypes.Add("Nintendo Wii U game");
 
@@ -682,6 +683,7 @@ namespace Aaru.Commands.Device
                                         mediaTypes.Add("Ultra HD Blu-ray movie");
                                         mediaTypes.Add("PlayStation 3 game");
                                         mediaTypes.Add("PlayStation 4 game");
+                                        mediaTypes.Add("PlayStation 5 game");
                                         mediaTypes.Add("Xbox One game");
                                         mediaTypes.Add("Nintendo Wii U game");
                                     }