Index: trunk/i386/libsaio/bootstruct.c
===================================================================
--- trunk/i386/libsaio/bootstruct.c	(revision 2637)
+++ trunk/i386/libsaio/bootstruct.c	(revision 2638)
@@ -128,7 +128,7 @@
 	}
 	else
 	{
-		// for 10.7 10.8 10.9 10.10
+		// for 10.7 10.8 10.9 10.10 10.11
 		void *oldAddr = bootArgs;
 		bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args));
 		bcopy(oldAddr, bootArgs, sizeof(boot_args));
Index: trunk/i386/libsaio/acpi_patcher.c
===================================================================
--- trunk/i386/libsaio/acpi_patcher.c	(revision 2637)
+++ trunk/i386/libsaio/acpi_patcher.c	(revision 2638)
@@ -330,15 +330,15 @@
 
 	}
 
-	// Patch DSDT Address if we have loaded DSDT.aml
-	if(new_dsdt)
+	// Patch DSDT address if we have loaded DSDT.aml
+	if (new_dsdt)
 	{
 		DBG("DSDT: Old @%x,%x, ",fadt_mod->DSDT,fadt_mod->X_DSDT);
 
-		fadt_mod->DSDT=(uint32_t)new_dsdt;
-		if ((uint32_t)(&(fadt_mod->X_DSDT))-(uint32_t)fadt_mod+8<=fadt_mod->Length)
+		fadt_mod->DSDT = (uint32_t)new_dsdt;
+		if ((uint32_t)(&(fadt_mod->X_DSDT)) - (uint32_t)fadt_mod + 8<=fadt_mod->Length)
 		{
-			fadt_mod->X_DSDT=(uint32_t)new_dsdt;
+			fadt_mod->X_DSDT = (uint32_t)new_dsdt;
 		}
 
 		DBG("New @%x,%x\n",fadt_mod->DSDT,fadt_mod->X_DSDT);
Index: trunk/i386/libsaio/disk.c
===================================================================
--- trunk/i386/libsaio/disk.c	(revision 2637)
+++ trunk/i386/libsaio/disk.c	(revision 2638)
@@ -1773,7 +1773,7 @@
 			}
 		}
 
-// Mountain Lion ?
+//		if ( MOUNTAIN_LION ){}
 
 		if ( MAVERICKS )
 		{
@@ -1793,8 +1793,10 @@
 			}
 		}
 
-// Yosemite ?
+//		if ( YOSEMITE ){}
 
+//		if ( GALA ){}
+
 	}
 
 	if (valid)
Index: trunk/i386/boot2/drivers.c
===================================================================
--- trunk/i386/boot2/drivers.c	(revision 2637)
+++ trunk/i386/boot2/drivers.c	(revision 2638)
@@ -253,7 +253,7 @@
 			}
 			else
 			{
-				if ( MAVERICKS || YOSEMITE ) // issue 352
+				if ( MAVERICKS || YOSEMITE ) // ( MAVERICKS || YOSEMITE || GALA ) // issue 352
 				{
 					strlcpy(gExtensionsSpec, dirSpec, 4087); /* 4096 - sizeof("Library/") */
 					strcat(gExtensionsSpec, "Library/");
Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 2637)
+++ trunk/i386/boot2/boot.c	(revision 2638)
@@ -317,7 +317,7 @@
 		else
 		{
 			// Lion, Mountain Lion, Mavericks and Yosemite prelink kernel cache file
-			// for 10.7 10.8 10.9 10.10
+			// for 10.7 10.8 10.9 10.10 10.11
 			snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kDefaultCachePathSnow);
 			verbose("Kernel Cache file path (Mac OS X 10.7 and newer): %s\n", kernelCacheFile);
 
@@ -767,7 +767,7 @@
 			// bootFile must start with a / if it not start with a device name
 			if (!bootFileWithDevice && (bootInfo->bootFile)[0] != '/')
 			{
-				if ( !YOSEMITE ) // Is not Yosemite 10.10
+				if ( !YOSEMITE ) // ( !YOSEMITE || !GALA ) Is not Yosemite 10.10 or Gala 10.11
 				{
 					snprintf(bootFile, sizeof(bootFile), "/%s", bootInfo->bootFile); // append a leading /
 				}
Index: trunk/i386/boot2/gui.c
===================================================================
--- trunk/i386/boot2/gui.c	(revision 2637)
+++ trunk/i386/boot2/gui.c	(revision 2638)
@@ -54,6 +54,8 @@
 	iDeviceGeneric_o,
 	iDeviceHFS,
 	iDeviceHFS_o,
+//	iDeviceHFS_gala,
+//	iDeviceHFS_gala_o,
 	iDeviceHFS_yos,
 	iDeviceHFS_yos_o,
 	iDeviceHFS_mav,
@@ -71,6 +73,8 @@
 
 	iDeviceHFSRAID,
 	iDeviceHFSRAID_o,
+//	iDeviceHFSRAID_gala,
+//	iDeviceHFSRAID_gala_o,
 	iDeviceHFSRAID_yos,
 	iDeviceHFSRAID_yos_o,
 	iDeviceHFSRAID_mav,
@@ -144,6 +148,8 @@
 	{.name = "device_generic_o",            .image = NULL},
 	{.name = "device_hfsplus",              .image = NULL},
 	{.name = "device_hfsplus_o",            .image = NULL},
+//	{.name = "device_hfsplus_gala",         .image = NULL},
+//	{.name = "device_hfsplus_gala_o",       .image = NULL},
 	{.name = "device_hfsplus_yos",          .image = NULL},
 	{.name = "device_hfsplus_yos_o",        .image = NULL},
 	{.name = "device_hfsplus_mav",          .image = NULL},
@@ -161,6 +167,8 @@
 
 	{.name = "device_hfsraid",              .image = NULL},
 	{.name = "device_hfsraid_o",            .image = NULL},
+//	{.name = "device_hfsraid_gala",         .image = NULL},
+//	{.name = "device_hfsraid_gala_o",       .image = NULL},
 	{.name = "device_hfsraid_yos",          .image = NULL},
 	{.name = "device_hfsraid_yos_o",        .image = NULL},
 	{.name = "device_hfsraid_mav",          .image = NULL},
@@ -386,6 +394,8 @@
 	LOADPNG(device_generic_o,               iDeviceGeneric);
 	LOADPNG(device_hfsplus,                 iDeviceGeneric);
 	LOADPNG(device_hfsplus_o,               iDeviceHFS);
+//	LOADPNG(device_hfsplus_gala,            iDeviceHFS);
+//	LOADPNG(device_hfsplus_gala_o,          iDeviceHFS_gala);
 	LOADPNG(device_hfsplus_yos,             iDeviceHFS);
 	LOADPNG(device_hfsplus_yos_o,           iDeviceHFS_yos);
 	LOADPNG(device_hfsplus_mav,             iDeviceHFS);
@@ -403,6 +413,8 @@
 
 	LOADPNG(device_hfsraid,                 iDeviceHFS);
 	LOADPNG(device_hfsraid_o,               iDeviceHFSRAID);
+//	LOADPNG(device_hfsraid_gala,            iDeviceHFSRAID);
+//	LOADPNG(device_hfsraid_gala_o,          iDeviceHFSRAID_gala);
 	LOADPNG(device_hfsraid_yos,             iDeviceHFSRAID);
 	LOADPNG(device_hfsraid_yos_o,           iDeviceHFSRAID_yos);
 	LOADPNG(device_hfsraid_mav,             iDeviceHFSRAID);