diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8f85d19b7c..765bb96743 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* peXXigen.c (_bfd_XX_print_private_bfd_data_common): Replace
+	IMAGE_SUBSYSTEM_EFI_ROM with IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER.
+
 2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/10074
diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index b3b39deda2..db6af64ef3 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -2198,6 +2198,7 @@ _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile)
     case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI:
       subsystem_name = "Wince CUI";
       break;
+    // These are from UEFI Platform Initialization Specification 1.1.
     case IMAGE_SUBSYSTEM_EFI_APPLICATION:
       subsystem_name = "EFI application";
       break;
@@ -2207,10 +2208,10 @@ _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile)
     case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
       subsystem_name = "EFI runtime driver";
       break;
-    // These are from revision 8.0 of the MS PE/COFF spec
-    case IMAGE_SUBSYSTEM_EFI_ROM:
-      subsystem_name = "EFI ROM";
+    case IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER:
+      subsystem_name = "SAL runtime driver";
       break;
+    // This is from revision 8.0 of the MS PE/COFF spec
     case IMAGE_SUBSYSTEM_XBOX:
       subsystem_name = "XBOX";
       break;
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5032687a68..1a8c62dbdb 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objcopy.c (set_pe_subsystem): Replace efi-rom with sal-rtd.
+	* doc/binutils.texi: Likewise.
+
 2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/10074
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index fe30d6a5f4..cdec81fd06 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -1564,7 +1564,7 @@ to be used as stack for this program.
 Specifies the subsystem under which your program will execute.  The
 legal values for @var{which} are @code{native}, @code{windows},
 @code{console}, @code{posix}, @code{efi-app}, @code{efi-bsd},
-@code{efi-rtd}, @code{efi-rom}, and @code{xbox}.  You may optionally set
+@code{efi-rtd}, @code{sal-rtd}, and @code{xbox}.  You may optionally set
 the subsystem version also.  Numeric values are also accepted for
 @var{which}.
 [This option is specific to PE targets.]
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index b7c84d8417..3fe874114d 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -3040,7 +3040,7 @@ set_pe_subsystem (const char *s)
       { "efi-app", 1, IMAGE_SUBSYSTEM_EFI_APPLICATION },
       { "efi-bsd", 1, IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER },
       { "efi-rtd", 1, IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER },
-      { "efi-rom", 1, IMAGE_SUBSYSTEM_EFI_ROM },
+      { "sal-rtd", 1, IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER },
       { "xbox", 0, IMAGE_SUBSYSTEM_XBOX }
     };
   short value;
diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog
index acfc3dcb74..e274a79eb9 100644
--- a/include/coff/ChangeLog
+++ b/include/coff/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* pe.h (IMAGE_SUBSYSTEM_EFI_ROM): Renamed to ...
+	(IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER): This.
+
 2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
 	* xcoff.h (xcoff_link_hash_table): Move to bfd/xcofflink.c.
diff --git a/include/coff/pe.h b/include/coff/pe.h
index a7fdd76a3c..c7e7bd26f6 100644
--- a/include/coff/pe.h
+++ b/include/coff/pe.h
@@ -161,7 +161,7 @@
 #define IMAGE_SUBSYSTEM_EFI_APPLICATION		10
 #define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER	11
 #define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER	12
-#define IMAGE_SUBSYSTEM_EFI_ROM			13
+#define IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER	13
 #define IMAGE_SUBSYSTEM_XBOX			14
   
 /* Magic values that are true for all dos/nt implementations.  */