diff --git a/arch/arm/configs/gfsc100_defconfig b/arch/arm/configs/gfsc100_defconfig
index da48860..2b60402 100644
--- a/arch/arm/configs/gfsc100_defconfig
+++ b/arch/arm/configs/gfsc100_defconfig
@@ -28,6 +28,7 @@
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_COMCERTO=y
 CONFIG_GOOGLE_FIBER_OPTIMUS=y
+CONFIG_GOOGLE_SPACECAST=y
 CONFIG_COMCERTO_MEMBUF=y
 CONFIG_COMCERTO_EPAVIS=y
 # CONFIG_COMCERTO_MSP is not set
diff --git a/arch/arm/mach-comcerto/Kconfig b/arch/arm/mach-comcerto/Kconfig
index f94f77c..84098f0 100644
--- a/arch/arm/mach-comcerto/Kconfig
+++ b/arch/arm/mach-comcerto/Kconfig
@@ -79,6 +79,12 @@
 	  
 endchoice
 
+config GOOGLE_SPACECAST
+	bool "Google Spacecast"
+	select GOOGLE_FIBER_OPTIMUS
+	help
+	  Say Y here if you intend to run this kernel with a Google Fiber Spacecast board
+	  (a variation of Optimus board).
 
 config MTD_COMCERTO_NOR
 	bool