diff --git a/FSDrivers/X64/ext4.efi b/FSDrivers/X64/ext4.efi
new file mode 100644
index 0000000000..9ed2b1c449
Binary files /dev/null and b/FSDrivers/X64/ext4.efi differ
diff --git a/FSDrivers/X64/ntfs.efi b/FSDrivers/X64/ntfs.efi
new file mode 100644
index 0000000000..47e2c25176
Binary files /dev/null and b/FSDrivers/X64/ntfs.efi differ
diff --git a/FSDrivers/ext4.inf b/FSDrivers/ext4.inf
new file mode 100644
index 0000000000..4f05010ff5
--- /dev/null
+++ b/FSDrivers/ext4.inf
@@ -0,0 +1,22 @@
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = ext4
+  FILE_GUID                      = 9d380387-a15a-4053-ae19-ff3495b6d0d5
+  MODULE_TYPE                    = UEFI_DRIVER
+  VERSION_STRING                 = 1.0
+
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#
+
+VALID_ARCHITECTURES           = X64
+
+[Binaries.X64]
+  PE32|X64/ext4.efi|*
+
diff --git a/FSDrivers/ntfs.inf b/FSDrivers/ntfs.inf
new file mode 100644
index 0000000000..e06e15effb
--- /dev/null
+++ b/FSDrivers/ntfs.inf
@@ -0,0 +1,22 @@
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = ntfs
+  FILE_GUID                      = 2282efd0-678b-4753-8d06-200d5940285d
+  MODULE_TYPE                    = UEFI_DRIVER
+  VERSION_STRING                 = 1.0
+
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#
+
+VALID_ARCHITECTURES           = X64
+
+[Binaries.X64]
+  PE32|X64/ntfs.efi|*
+
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 603825ce8d..f759ee1fb9 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -170,6 +170,12 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 
 INF FatPkg/EnhancedFatDxe/Fat.inf
 
+!if $(ARCH) == IA32
+!else
+INF  RuleOverride=BINARY USE = X64 FSDrivers/ntfs.inf
+INF  RuleOverride=BINARY USE = X64 FSDrivers/ext4.inf
+!endif
+
 #
 # SD/eMMC Support
 #