diff --git a/debian/arch/config b/debian/arch/config
index 9f9ec5977..ae0e97fe7 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -100,7 +100,7 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
-CONFIG_SECCOMP=y
+# CONFIG_SECCOMP is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_NSC=m
diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64
index c2b408e64..0a547056e 100644
--- a/debian/arch/powerpc/config.powerpc64
+++ b/debian/arch/powerpc/config.powerpc64
@@ -62,7 +62,6 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_QLOGIC_1280_1040=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_IBMVSCSI=m
-CONFIG_SECCOMP=y
 # CONFIG_SERIAL_ICOM is not set
 CONFIG_SMP=y
 CONFIG_STOP_MACHINE=y
diff --git a/debian/arch/powerpc/vserver/config.powerpc64 b/debian/arch/powerpc/vserver/config.powerpc64
index c2b408e64..0a547056e 100644
--- a/debian/arch/powerpc/vserver/config.powerpc64
+++ b/debian/arch/powerpc/vserver/config.powerpc64
@@ -62,7 +62,6 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_QLOGIC_1280_1040=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_IBMVSCSI=m
-CONFIG_SECCOMP=y
 # CONFIG_SERIAL_ICOM is not set
 CONFIG_SMP=y
 CONFIG_STOP_MACHINE=y
diff --git a/debian/changelog b/debian/changelog
index bc37a76ab..12d24789b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   *
 
- -- Bastian Blank <waldi@debian.org>  Thu, 23 Mar 2006 21:40:17 +0100
+  [ maximilian attems ]
+  * Unset CONFIG_SECCOMP.
+
+ -- maximilian attems <maks@sternwelten.at>  Tue, 11 Apr 2006 01:07:28 +0200
 
 linux-2.6 (2.6.16-6) UNRELEASED; urgency=low
 
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 5c8b3e5bd..337e1218f 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -2,7 +2,7 @@ Source: linux-@major@
 Section: devel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: Andres Salomon <dilinger@debian.org>, Bastian Blank <waldi@debian.org>, Simon Horman <horms@debian.org>, Sven Luther <luther@debian.org>, Jonas Smedegaard <dr@jones.dk>, Norbert Tretkowski <nobse@debian.org>, Frederik Schüler <fs@debian.org>
+Uploaders: Andres Salomon <dilinger@debian.org>, Bastian Blank <waldi@debian.org>, Simon Horman <horms@debian.org>, Sven Luther <luther@debian.org>, Jonas Smedegaard <dr@jones.dk>, Norbert Tretkowski <nobse@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@sternwelten.at>
 Standards-Version: 3.6.1.0
 Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.035), ocaml-interp, python, python2.4-minimal
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto