diff --git a/security/vserver/config.hlp b/security/vserver/config.hlp
deleted file mode 100644
index 985b4c692..000000000
--- a/security/vserver/config.hlp
+++ /dev/null
@@ -1,18 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../vserver/config.hlp
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-# Copyright (C) 1998 - 2003 Clifford Wolf
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-SDECFG_PKG_VSERVER_QUOTA
-  Please check here if you want to enable Virtual Server per Context
-  Quota Support.
diff --git a/security/vserver/config.in b/security/vserver/config.in
deleted file mode 100644
index 9e7267f6a..000000000
--- a/security/vserver/config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../vserver/config.in
-# Copyright (C) 2006 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-if pkgcheck vserver X &&  pkgcheck linux24 X ; then
-	menu_begin MENU_VSERVER 'VServer Options'
-		bool 'Enable per Context Quota Support (2.4 only)' \
-			SDECFG_PKG_VSERVER_QUOTA 0
-	menu_end
-fi
diff --git a/security/vserver/kernel-vquota.conf.sh b/security/vserver/kernel-vquota.conf.sh
deleted file mode 100644
index dc7556340..000000000
--- a/security/vserver/kernel-vquota.conf.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../vserver/kernel-vquota.conf.sh
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-# Copyright (C) 1998 - 2003 Clifford Wolf
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-echo "CONFIG_QUOTA=y" >> $1
-echo "CONFIG_BLK_DEV_VROOT=y" >> $1
diff --git a/security/vserver/pkg_linux24_post.conf b/security/vserver/pkg_linux24_post.conf
deleted file mode 100644
index 4dcd9f07c..000000000
--- a/security/vserver/pkg_linux24_post.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../vserver/pkg_linux24_post.conf
-# Copyright (C) 2008 The OpenSDE Project
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-# Copyright (C) 1998 - 2003 Clifford Wolf
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-. $base/package/*/vserver/pkg_linux_post.conf
diff --git a/security/vserver/pkg_linux_post.conf b/security/vserver/pkg_linux_post.conf
index 823874329..243d41289 100644
--- a/security/vserver/pkg_linux_post.conf
+++ b/security/vserver/pkg_linux_post.conf
@@ -59,30 +59,3 @@ echo_status "Including VServer ($pkg_ctx_ver) support."
 hook_add postpatch 5 "lx_extraversion=\$lx_extraversion-vs${pkg_ctx_ver}"
 var_append patchfiles ' ' $pkg_ctx_tempdir/vserver-$pkg_ctx_ver.patch
 [ -n "${pkg_ctx_fixes}" ] && var_append patchfiles ' ' ${pkg_ctx_fixes}
-
-if [ "$SDECFG_PKG_VSERVER_QUOTA" = "1" ]; then
-	pkg_ctx_lxver=$ver.
-	pkg_vquota_patch=
-	if [[ $ver == 2.4.* ]]; then
-		# prepare vquota patch
-		while [ "$pkg_ctx_lxver" != "${pkg_ctx_lxver%.*}" -a -z "$pkg_quota_patch" ]; do
-			pkg_ctx_lxver=${pkg_ctx_lxver%.*}
-			pkg_vquota_patch=`match_source_file -p " patch-${pkg_ctx_lxver}[^ ]*-q.*.diff" vserver | head -n 1`
-		done
-	fi
-
-	if [ -n "$pkg_vquota_patch" ]; then
-		pkg_vquota_ver=$( echo $pkg_vquota_patch | sed -n -e 's,.*-q\(.*\).diff.bz2,\1,p' )
-
-		[[ ${pkg_vquota_patch} == *.bz2 ]] && x=bzcat || x=cat
-		$x $pkg_vquota_patch \
-			> $pkg_ctx_tempdir/vquota-$pkg_vquota_ver.patch
-
-		echo_status "Including Per Context Quota/Disk Limits ($pkg_vquota_ver) support."
-		var_append patchfiles  ' ' $pkg_ctx_tempdir/vquota-$pkg_vquota_ver.patch
-		var_append lx_confscripts ' ' $pkg_ctx_confdir/kernel-vquota.conf.sh
-	else
-		echo_status "No Per Context Quota/Disk Limits support available for Linux ${pkg_ctx_lxver}"
-	fi
-fi
-
diff --git a/security/vserver/vserver.desc b/security/vserver/vserver.desc
index 119fdc84f..f35d87077 100644
--- a/security/vserver/vserver.desc
+++ b/security/vserver/vserver.desc
@@ -41,13 +41,5 @@
 [V] 2.2.0.6
 [P] O -?---5---9 190.200
 
-[F] NOPARALLEL DIETLIBC NO-SSP
-
-# linux26 patches
 [D] 658328487 patch-2.6.22.18-vs2.2.0.6.diff http://ftp.linux-vserver.org/pub/kernel/vs2.2/
 #[D] 299972723 patch-2.6.21.5-vs2.2.0-rc3.diff http://ftp.linux-vserver.org/pub/kernel/vs2.2/testing/
-
-# linux24 patches
-[D] 288983213 patch-2.4.31-vs1.2.11-rc1.diff http://vserver.13thfloor.at/Experimental/
-[D] 3028530622 patch-2.4.27-vs1.29-q0.14.diff.bz2 http://www.13thfloor.at/vserver/s_addons/quota/
-