diff --git a/debian/changelog b/debian/changelog
index 22737e2eb..92c62e11c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,16 @@ linux (3.13~rc4-1~exp1) UNRELEASED; urgency=low
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 21 Dec 2013 17:41:34 +0000
 
+linux (3.12.6-2) unstable; urgency=medium
+
+  [ Bastian Blank ]
+  * [x86] Make MICROCODE built-in for early microcode loading.
+
+  [ Ben Hutchings ]
+  * [armhf] linux-headers: Fix typo in compiler dependency
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 29 Dec 2013 16:56:20 +0100
+
 linux (3.12.6-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 622dd0344..33801fc3e 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -11,7 +11,7 @@ configs:
  armhf/config
 
 [relations]
-headers%gcc-4.8: linux-compiler-gcc-4.8--arm
+headers%gcc-4.8: linux-compiler-gcc-4.8-arm
 
 [armmp_build]
 image-file: arch/arm/boot/zImage
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 345d0947e..6c576830b 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -31,7 +31,7 @@ CONFIG_X86_MCE_AMD=y
 # CONFIG_X86_ANCIENT_MCE is not set
 CONFIG_X86_MCE_INJECT=m
 CONFIG_I8K=m
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_X86_MSR=m