diff --git a/[refs] b/[refs]
index a81d23b30f6d..0b90a8120c2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3dd3b5a29bb9582957451531fed461628dfc834
+refs/heads/master: 845adf7266a7ba6970bf982ffd96abc60d2018ab
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 039c3f04aac5..5aee45356b58 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1513,6 +1513,11 @@ config RELOCATABLE
 	  it has been loaded at and the compile time physical address
 	  (CONFIG_PHYSICAL_START) is ignored.
 
+# Relocation on x86-32 needs some additional build support
+config X86_NEED_RELOCS
+	def_bool y
+	depends on X86_32 && RELOCATABLE
+
 config PHYSICAL_ALIGN
 	hex
 	prompt "Alignment value to which kernel should be aligned" if X86_32