diff --git a/boot/freeldr/freeldr/arch/archwsup.c b/boot/freeldr/freeldr/arch/archwsup.c
index fe3d5f5e9c7..226f1c8211f 100644
--- a/boot/freeldr/freeldr/arch/archwsup.c
+++ b/boot/freeldr/freeldr/arch/archwsup.c
@@ -62,6 +62,9 @@ const PCSTR ArcTypes[MaximumType + 1] = // CmTypeName
     "Undefined"
 };
 
+#define TAG_HW_COMPONENT_DATA   'DCwH'
+#define TAG_HW_NAME             'mNwH'
+
 PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot;
 
 // ARC Disk Information
@@ -70,31 +73,54 @@ ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[32];
 
 /* FUNCTIONS ******************************************************************/
 
-#define TAG_HW_COMPONENT_DATA   'DCwH'
-#define TAG_HW_NAME             'mNwH'
-
 VOID
 AddReactOSArcDiskInfo(
-    IN PCSTR ArcName,
-    IN ULONG Signature,
-    IN ULONG Checksum,
-    IN BOOLEAN ValidPartitionTable)
+    _In_ PCSTR ArcName,
+    _In_opt_ PGUID GptDiskGuid,
+    _In_ ULONG Signature,
+    _In_ ULONG Checksum,
+    _In_ BOOLEAN ValidPartitionTable)
 {
-    ASSERT(reactos_disk_count < sizeof(reactos_arc_disk_info)/sizeof(reactos_arc_disk_info[0]));
+    PARC_DISK_SIGNATURE ArcDiskSignature;
+    C_ASSERT(sizeof(*GptDiskGuid) == sizeof(ArcDiskSignature->GptSignature));
+
+    ASSERT(reactos_disk_count < RTL_NUMBER_OF(reactos_arc_disk_info));
 
     /* Fill out the ARC disk block */
+    RtlZeroMemory(&reactos_arc_disk_info[reactos_disk_count],
+                  sizeof(reactos_arc_disk_info[reactos_disk_count]));
+    ArcDiskSignature = &(reactos_arc_disk_info[reactos_disk_count].DiskSignature);
 
-    reactos_arc_disk_info[reactos_disk_count].DiskSignature.Signature = Signature;
-    reactos_arc_disk_info[reactos_disk_count].DiskSignature.CheckSum = Checksum;
-    reactos_arc_disk_info[reactos_disk_count].DiskSignature.ValidPartitionTable = ValidPartitionTable;
+    ArcDiskSignature->Signature = Signature;
+    ArcDiskSignature->CheckSum = Checksum;
+    ArcDiskSignature->ValidPartitionTable = ValidPartitionTable;
+
+    ArcDiskSignature->IsGpt = (GptDiskGuid != NULL);
+    if (GptDiskGuid)
+    {
+        RtlCopyMemory(&ArcDiskSignature->GptSignature,
+                      GptDiskGuid, sizeof(*GptDiskGuid));
+    }
 
     strcpy(reactos_arc_disk_info[reactos_disk_count].ArcName, ArcName);
-    reactos_arc_disk_info[reactos_disk_count].DiskSignature.ArcName =
-        reactos_arc_disk_info[reactos_disk_count].ArcName;
+    ArcDiskSignature->ArcName = reactos_arc_disk_info[reactos_disk_count].ArcName;
 
-    reactos_disk_count++;
+    ++reactos_disk_count;
 }
 
+ULONG ArcGetDiskCount(VOID)
+{
+    return reactos_disk_count;
+}
+
+PARC_DISK_SIGNATURE_EX ArcGetDiskInfo(ULONG Index)
+{
+    if (Index >= reactos_disk_count)
+        return NULL;
+    return &reactos_arc_disk_info[Index];
+}
+
+
 //
 // ARC Component Configuration Routines
 //
@@ -243,18 +269,3 @@ FldrCreateComponentKey(
     /* Return the child */
     *ComponentKey = ComponentData;
 }
-
-ULONG ArcGetDiskCount(VOID)
-{
-    return reactos_disk_count;
-}
-
-PARC_DISK_SIGNATURE_EX ArcGetDiskInfo(ULONG Index)
-{
-    if (Index >= reactos_disk_count)
-    {
-        return NULL;
-    }
-
-    return &reactos_arc_disk_info[Index];
-}
diff --git a/boot/freeldr/freeldr/arch/arm/macharm.c b/boot/freeldr/freeldr/arch/arm/macharm.c
index e059ee07948..dc4a8db8c1c 100644
--- a/boot/freeldr/freeldr/arch/arm/macharm.c
+++ b/boot/freeldr/freeldr/arch/arm/macharm.c
@@ -127,7 +127,7 @@ ArmHwDetect(
     RamDiskInitialize(TRUE, NULL, NULL);
 
     /* Fill out the ARC disk block */
-    AddReactOSArcDiskInfo("ramdisk(0)", 0xBADAB00F, 0xDEADBABE, TRUE);
+    AddReactOSArcDiskInfo("ramdisk(0)", NULL, 0xBADAB00F, 0xDEADBABE, TRUE);
     ASSERT(reactos_disk_count == 1);
 
     /* Return the root node */
diff --git a/boot/freeldr/freeldr/disk/disk.c b/boot/freeldr/freeldr/disk/disk.c
index af9dc9d8894..98e30bcbff3 100644
--- a/boot/freeldr/freeldr/disk/disk.c
+++ b/boot/freeldr/freeldr/disk/disk.c
@@ -13,6 +13,20 @@
 #include <debug.h>
 DBG_DEFAULT_CHANNEL(DISK);
 
+#include "disk/part_gpt.h"
+
+// Defined in part_gpt.c
+extern BOOLEAN
+DiskReadGptHeader(
+    _In_ UCHAR DriveNumber,
+    _Out_ PGPT_TABLE_HEADER GptHeader);
+
+#define GUID_FORMAT_STR "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x"
+#define GUID_ELEMENTS(Guid) \
+    (Guid)->Data1, (Guid)->Data2, (Guid)->Data3, \
+    (Guid)->Data4[0], (Guid)->Data4[1], (Guid)->Data4[2], (Guid)->Data4[3], \
+    (Guid)->Data4[4], (Guid)->Data4[5], (Guid)->Data4[6], (Guid)->Data4[7]
+
 #define FIRST_PARTITION 1
 
 /* DISK IO ERROR SUPPORT *****************************************************/
@@ -77,10 +91,14 @@ DiskInitialize(
     ULONG Checksum, Signature;
     BOOLEAN ValidPartitionTable;
     BOOLEAN IsCdRom;
+    PGUID GptDiskGuid = NULL;
+    GPT_TABLE_HEADER GptHeader;
     PARTITION_TABLE_ENTRY PartitionTableEntry;
     CHAR ArcName[MAX_PATH];
     NTSTATUS NtStatus;
 
+    TRACE("DiskInitialize(0x%02X, '%s', Type: %lu)\n", DriveNumber, DeviceName, DeviceType);
+
     IsCdRom = (DeviceType == CdromController);
     if (IsCdRom)
     {
@@ -128,8 +146,21 @@ DiskInitialize(
             return ENOMEM;
     }
 
+    /* GPT disk signature support */
+    if (DeviceType == DiskPeripheral)
+    {
+        if (DiskReadGptHeader(DriveNumber, &GptHeader))
+            GptDiskGuid = &GptHeader.DiskGuid;
+    }
+    if (GptDiskGuid)
+    {
+        TRACE("Disk 0x%02X is GPT, DiskGuid: {" GUID_FORMAT_STR "}\n",
+              DriveNumber, GUID_ELEMENTS(GptDiskGuid));
+    }
+
     /* Fill out the ARC disk block */
-    AddReactOSArcDiskInfo(DeviceName, Signature, Checksum, ValidPartitionTable);
+    AddReactOSArcDiskInfo(DeviceName, GptDiskGuid, Signature,
+                          Checksum, ValidPartitionTable);
 
     if (pChecksum)
         *pChecksum = Checksum;
diff --git a/boot/freeldr/freeldr/include/arch/archwsup.h b/boot/freeldr/freeldr/include/arch/archwsup.h
index f691fc25d63..7719d0e2770 100644
--- a/boot/freeldr/freeldr/include/arch/archwsup.h
+++ b/boot/freeldr/freeldr/include/arch/archwsup.h
@@ -24,10 +24,11 @@
 
 VOID
 AddReactOSArcDiskInfo(
-    IN PCSTR ArcName,
-    IN ULONG Signature,
-    IN ULONG Checksum,
-    IN BOOLEAN ValidPartitionTable);
+    _In_ PCSTR ArcName,
+    _In_opt_ PGUID GptDiskGuid,
+    _In_ ULONG Signature,
+    _In_ ULONG Checksum,
+    _In_ BOOLEAN ValidPartitionTable);
 
 //
 // ARC Component Configuration Routines