diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index 7d34e11d016738ae938209dcde11cc73a5fccda6..2df6072da4a7f83f9deb3f20978feac73402dd35 100644
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -15,18 +15,6 @@ Default
    FileMode 0664;
 }
 
-tree "dists/oldstable/updates"
-{
-   FileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
-   Sections "main contrib non-free";
-   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
-   BinOverride "override.sarge.$(SECTION)";
-   ExtraOverride "override.sarge.extra.$(SECTION)";
-   SrcOverride "override.sarge.$(SECTION).src";
-   Contents " ";
-};
-
 tree "dists/stable/updates"
 {
    FileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 7e75bcbbfaae65333047869dae7fcfebe4750b83..6c3e091181766cf34ebf06078025e9628ceba373 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -2,10 +2,9 @@
 #
 # Executed after cron.unchecked
 
-ARCHS_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390 amd64"
 ARCHS_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
 ARCHS_testing="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc sparc s390"
-DISTS="oldstable stable testing"
+DISTS="stable testing"
 SSH_SOCKET=~/.ssh/buildd.debian.org.socket
 
 set -e
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 6e2ebc708f604381ea53db4952ae1dfeec10f978..8cff5ada66c5d0dab682735895c74dc2ac7b0cb3 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -25,7 +25,6 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
@@ -112,41 +111,6 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Oldstable
-  {
-	Components 
-	{
-	  updates/main;
-	  updates/contrib;
-	  updates/non-free;
-	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  alpha;
-	  amd64; 
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  m68k;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
-	Announce "dak@security.debian.org";
-	Version "3.1";
-	Origin "Debian";
-	Label "Debian-Security";
-	Description "Debian 3.1 Security Updates";
-	CodeName "sarge";
-	OverrideCodeName "sarge";
-	CopyDotDak "/org/security.debian.org/queue/done/";
-  };
-
   Stable
   {
 	Components 
@@ -219,7 +183,6 @@ Suite
 
 SuiteMappings
 {
-  "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
@@ -403,7 +366,6 @@ Location
       Archive "security";
       Suites 
 	{
-	  Oldstable;
 	  Stable;
 	  Testing;
         };
diff --git a/config/debian-security/vars b/config/debian-security/vars
index 2add99ea8016e57d71d24b870920e4a1e5296944..e4757455a19c0a13b018f355d463f93888e2b43c 100644
--- a/config/debian-security/vars
+++ b/config/debian-security/vars
@@ -14,7 +14,7 @@ uploadhost=ftp-master.debian.org
 uploaddir=/pub/UploadQueue/
 
 components="main non-free contrib"
-suites="oldstable stable testing"
+suites="stable testing"
 override_types="deb dsc udeb"
 
 PATH=$masterdir:$PATH