diff --git a/init/Kconfig b/init/Kconfig
index 9632183c7d71264eafef01eed2c7cdf7d92574d4..6b27a0b14dee8ac1d3640565e45d0069eb55128c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -85,6 +85,13 @@ config BUILD_XEN_KERNELS
 	  Enable this option in order to build the Xentium kernel programs
 	  in dsp/xentium.
 
+config XENTIUM_PROC_DEMO
+	bool "Build a Xentium Processing Demo kernel"
+	depends on BUILD_XEN_KERNELS && XENTIUM
+	help
+	  Enable this option in order to build a kernel that runs a Xentium
+	  processing demo.
+
 
 menu "Compile-time checks and compiler options"
 
diff --git a/init/Makefile b/init/Makefile
index 45dfaa0abfe515d182fe001a662c45ee774f77e7..7ea4cb25942e6cf7225bc6937460b322cf64155c 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -1,3 +1,3 @@
 obj-y += main.o
-obj-y += xentium_demo.o
+obj-$(CONFIG_XENTIUM_PROC_DEMO) += xentium_demo.o
 obj-$(CONFIG_EMBED_MODULES_IMAGE) += modules-image.o
diff --git a/init/main.c b/init/main.c
index 7243ad858343983f4901275ca86b85e40b44be66..1162c3af82f83d0f34ee6155ef6cb8fe8795b6b4 100644
--- a/init/main.c
+++ b/init/main.c
@@ -102,8 +102,10 @@ int main(void)
 	cpu_dcache_disable();
 #endif
 
+#ifdef CONFIG_XENTIUM_PROC_DEMO
 	/* run the demo */
 	xen_demo();
+#endif
 
 	return 0;
 }