diff --git a/debian/changelog b/debian/changelog
index 661b25e37..2c7729e7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,9 @@ linux-2.6 (2.6.30~rc6-1~experimental.1) UNRELEASED; urgency=low
   * [mips(el)/sb1-bcm91250a] Set CONFIG_SCSI_AIC7XXX=y, it is needed
     on the build daemons.
 
+  [ Bastian Blank ]
+  * [x86] Disable X86_PPRO_FENCE.
+
  -- maximilian attems <maks@debian.org>  Mon, 30 Mar 2009 14:40:26 +0200
 
 linux-2.6 (2.6.29-5) unstable; urgency=low
diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/none/config.486
index 4f050dada..0848814ea 100644
--- a/debian/config/i386/none/config.486
+++ b/debian/config/i386/none/config.486
@@ -22,7 +22,6 @@ CONFIG_M486=y
 # CONFIG_M686 is not set
 ## end choice
 CONFIG_X86_GENERIC=y
-CONFIG_X86_PPRO_FENCE=y
 
 ##
 ## file: drivers/char/Kconfig
diff --git a/debian/config/i386/none/config.686 b/debian/config/i386/none/config.686
index 6f4f4ab03..afec512dc 100644
--- a/debian/config/i386/none/config.686
+++ b/debian/config/i386/none/config.686
@@ -23,7 +23,6 @@ CONFIG_HIGHMEM4G=y
 CONFIG_M686=y
 ## end choice
 # CONFIG_X86_GENERIC is not set
-CONFIG_X86_PPRO_FENCE=y
 
 ##
 ## file: drivers/char/Kconfig
diff --git a/debian/config/i386/none/config.686-bigmem b/debian/config/i386/none/config.686-bigmem
index 4bf53e75d..43cd0c86f 100644
--- a/debian/config/i386/none/config.686-bigmem
+++ b/debian/config/i386/none/config.686-bigmem
@@ -33,7 +33,6 @@ CONFIG_X86_PAE=y
 CONFIG_M686=y
 ## end choice
 # CONFIG_X86_GENERIC is not set
-CONFIG_X86_PPRO_FENCE=y
 
 ##
 ## file: drivers/char/Kconfig