Index: trunk/doc/BootHelp.txt
===================================================================
--- trunk/doc/BootHelp.txt	(revision 28)
+++ trunk/doc/BootHelp.txt	(revision 29)
@@ -92,7 +92,6 @@
     =Yes|No                 Fix rescan issues when using a DVD reader in AHCI mode. 
   Rescan=Yes                Enable CD-ROM rescan mode.
   "Rescan Prompt"=Yes       Prompts for enable CD-ROM rescan mode.
-  SystemId=<UUID>	    [DEPRECATED since RC5] Set manually the system id UUID,
-  			    Please use SMBIOS config option "SMsystemid" instead.
-			    SMUUID in smbios config is also DEPRECATED 
-			    and won't be supported in next releases.
+  SystemId=<UUID>	    Set manually the system id UUID,
+			    SMUUID in smbios config is a reserved field and should not be used.
+			    So SMUUID has no effect on SystemId in this version
Index: trunk/CHANGES
===================================================================
--- trunk/CHANGES	(revision 28)
+++ trunk/CHANGES	(revision 29)
@@ -1,4 +1,4 @@
-- Started to deprecate former system id uuid options: now encouraging to use SMsystemid because it follows smbios options naming convention, is not as vague as SMUUID, and should belong to smbios config, not bootConfig.
+- Kept SystemID as the only option to change manually the system-id 
   For theses reasons, SystemId from bootConfig and SMUUID from smbiosConfig aer now DEPRECATED.
 
 - Integrated JrCs fadt patch (kept for RC5 the existing DSDT.aml  retry algo that disapeared in his patch, should be more discussed for RC6)
Index: trunk/i386/libsaio/fake_efi.c
===================================================================
--- trunk/i386/libsaio/fake_efi.c	(revision 28)
+++ trunk/i386/libsaio/fake_efi.c	(revision 29)
@@ -471,17 +471,9 @@
 
     // Rek: new SMsystemid option conforming to smbios notation standards, this option should
     // belong to smbios config only ...
-    const char * sysId = getStringForKey("SMsystemid", &bootInfo->smbiosConfig);
+    const char * sysId = getStringForKey("SystemId", &bootInfo->smbiosConfig);
     EFI_CHAR8* ret = getUUIDFromString(sysId);
 
-    // Rek: Deprecated in RC5, will be REMOVED in RC6 (should not belong to bootConfig but smbiosConfig)
-    if(!sysId || !ret)   // try smbios.plist SMUUID override
-      ret=getUUIDFromString((sysId = getStringForKey("SystemId",&bootInfo->bootConfig)));
-    
-    // Rek: Deprecated in RC5, will be REMOVED in RC6 (SMUUID name is too vague: there is more than one UUID in the system)
-    if(!sysId || !ret)   // try smbios.plist SMUUID override
-      ret=getUUIDFromString((sysId = getStringForKey("SMUUID",&bootInfo->smbiosConfig)));
-
     if(!sysId || !ret)  { // try bios dmi info UUID extraction 
       ret = getSmbiosUUID();
       sysId=0;