diff --git a/Makefile b/Makefile
index fada32b0f5..b3e3e42cb9 100644
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,10 @@ BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbri
 BUILD-y += util/cbfstool
 BUILD-$(CONFIG_ARCH_X86) += src/pc80
 
+ifneq ($(CONFIG_LOCALVERSION),"")
+COREBOOT_EXTRA_VERSION := -$(shell echo $(CONFIG_LOCALVERSION))
+endif
+
 # The primary target needs to be here before we include the
 # other files
 
@@ -241,7 +245,7 @@ STACKPROTECT += $(call cc-option, -fno-stack-protector,)
 
 CFLAGS = $(STACKPROTECT) $(INCLUDES) -Os -nostdinc
 CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS +=-Wwrite-strings -Wredundant-decls -Wno-trigraphs 
+CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs 
 CFLAGS += -Wstrict-aliasing -Wshadow 
 CFLAGS += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
 
diff --git a/src/Kconfig b/src/Kconfig
index 5702d7abf1..b2508bbc8a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -27,6 +27,15 @@
 
 mainmenu "Coreboot Configuration"
 
+menu "General setup"
+
+config LOCALVERSION
+	string "Local version - append to coreboot release"
+	help
+	  Append an extra string to the end of the coreboot version.
+
+endmenu
+
 source src/mainboard/Kconfig
 source src/arch/i386/Kconfig
 source src/arch/ppc/Kconfig