diff --git a/Kconfig b/Kconfig
index 1b9b9b15b1..8c70e9ac6a 100644
--- a/Kconfig
+++ b/Kconfig
@@ -5,6 +5,33 @@
 
 mainmenu "LinuxBIOS Configuration"
 
+menu "General setup"
+
+config EXPERIMENTAL
+        bool "Prompt for development and/or incomplete code/mainboards"
+        ---help---
+	  Enable this option if you want to test development features or
+	  incomplete/unsupported mainboards.
+
+	  We do not make any guarantees about anything that is marked
+	  as EXPERIMENTAL! You have been warned!
+
+config EXPERT
+        bool "Expert mode"
+        ---help---
+	  This allows you to select certain advanced configuration options.
+	  It is mainly intended for LinuxBIOS developers.
+
+	  Warning: Only enable this option if you really know what you're
+	  doing! You have been warned!
+
+config LOCALVERSION
+        string "Local version - append to LinuxBIOS release"
+        help
+	  Append an extra string to the end of the LinuxBIOS version.
+
+endmenu
+
 source mainboard/Kconfig
 source arch/Kconfig
 source lib/Kconfig
diff --git a/Makefile b/Makefile
index cf9f184273..fdaafd80d8 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,11 @@ ARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
 
 KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
 
+# TODO: Check whether this really works!
+ifdef $(CONFIG_LOCALVERSION)
+KERNELVERSION = "$(KERNELVERSION)-$(CONFIG_LOCALVERSION)"
+endif
+
 have_dotconfig := $(wildcard .config)
  
 src:=$(shell pwd)
diff --git a/console/Kconfig b/console/Kconfig
index 4aaea0e06e..0dcaf60c5e 100644
--- a/console/Kconfig
+++ b/console/Kconfig
@@ -135,8 +135,8 @@ config CONSOLE_VGA
 	  Send LinuxBIOS output to VGA console as soon as VGA is initialized.
 
 config CONSOLE_USB
-	boolean "USB2 console support"
-	depends CONSOLE
+	boolean "USB2 console support (EXPERIMENTAL)"
+	depends CONSOLE && EXPERIMENTAL
 	help
 	  Send LinuxBIOS output to USB2 (EHCI) console.
 
diff --git a/mainboard/emulation/Kconfig b/mainboard/emulation/Kconfig
index 93a7107a05..0ff172f667 100644
--- a/mainboard/emulation/Kconfig
+++ b/mainboard/emulation/Kconfig
@@ -10,7 +10,8 @@ config BOARD_EMULATION_QEMU_X86
 	  x86 QEMU variant.
 
 config BOARD_EMULATION_QEMU_POWERPC
-	bool "PowerPC QEMU"
+	bool "PowerPC QEMU (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	select ARCH_POWERPC
 	help
 	  PowerPC QEMU variant.