Index: UnixPkg/UnixPkg.dsc
===================================================================
--- UnixPkg/UnixPkg.dsc	(revision 14398)
+++ UnixPkg/UnixPkg.dsc	(working copy)
@@ -4,7 +4,7 @@
 #
 # The Emulation Platform can be used to debug individual modules, prior to creating
 #       a real platform. This also provides an example for how an DSC is created.
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
 #    are licensed and made available under the terms and conditions of the BSD License
@@ -244,6 +244,7 @@
   IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
   UnixPkg/BootModePei/BootModePei.inf
   UnixPkg/UnixFlashMapPei/FlashMap.inf
+  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
   UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
   UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
Index: UnixPkg/UnixPkg.fdf
===================================================================
--- UnixPkg/UnixPkg.fdf	(revision 14398)
+++ UnixPkg/UnixPkg.fdf	(working copy)
@@ -1,7 +1,7 @@
 ## @file
 # This is Unix FDF file with UEFI HII features enabled
 #
-# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
 #    are licensed and made available under the terms and conditions of the BSD License
@@ -98,12 +98,12 @@
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
 #NV_FTW_WORKING
 DATA = {
-  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEfiSystemNvDataFvGuid         =
-  #  { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}
-  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,
-  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,
+  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gWorkingBlockSignatureGuid         =
+  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}
+  0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,
+  0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95,
   # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved
-  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,
+  0xE2, 0x33, 0xF2, 0x03, 0xFE, 0xFF, 0xFF, 0xFF,
   # WriteQueueSize: UINT64
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
@@ -173,6 +173,7 @@
 INF  UnixPkg/UnixFlashMapPei/FlashMap.inf
 INF  UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
 INF  UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
+INF  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
 INF  UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
Index: UnixPkg/UnixPkgX64.dsc
===================================================================
--- UnixPkg/UnixPkgX64.dsc	(revision 14398)
+++ UnixPkg/UnixPkgX64.dsc	(working copy)
@@ -4,7 +4,7 @@
 #
 # The Emulation Platform can be used to debug individual modules, prior to creating
 #       a real platform. This also provides an example for how an DSC is created.
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 # Portions copyright (c) 2010, Apple, Inc. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
@@ -253,6 +253,7 @@
   IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
   UnixPkg/BootModePei/BootModePei.inf
   UnixPkg/UnixFlashMapPei/FlashMap.inf
+  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
   UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
   UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
Index: UnixPkg/UnixPkgX64.fdf
===================================================================
--- UnixPkg/UnixPkgX64.fdf	(revision 14398)
+++ UnixPkg/UnixPkgX64.fdf	(working copy)
@@ -1,7 +1,7 @@
 ## @file
 # This is Unix FDF file with UEFI HII features enabled
 #
-# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
 # Portions copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
@@ -99,12 +99,12 @@
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
 #NV_FTW_WORKING
 DATA = {
-  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEfiSystemNvDataFvGuid         =
-  #  { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}
-  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,
-  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,
+  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gWorkingBlockSignatureGuid         =
+  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}
+  0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,
+  0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95,
   # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved
-  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,
+  0xE2, 0x33, 0xF2, 0x03, 0xFE, 0xFF, 0xFF, 0xFF,
   # WriteQueueSize: UINT64
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
@@ -174,6 +174,7 @@
 INF  UnixPkg/UnixFlashMapPei/FlashMap.inf
 INF  UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
 INF  UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
+INF  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
 INF  UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf