diff --git a/package/mnemoc/vquota/TODO b/package/mnemoc/vquota/TODO
deleted file mode 100644
index 006e008a5..000000000
--- a/package/mnemoc/vquota/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- quota-3.09 patch
diff --git a/package/mnemoc/vquota/make_install.patch b/package/mnemoc/vquota/make_install.patch
deleted file mode 100644
index 0928f9138..000000000
--- a/package/mnemoc/vquota/make_install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mnemoc/vquota/make_install.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# 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; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./Makefile.orig	Tue Feb 11 07:24:43 2003
-+++ ./Makefile	Tue Feb 11 07:32:10 2003
-@@ -11,6 +11,9 @@
- 	rm -f *.o
- 	rm -f $(TARGETS)
- 
-+install: all
-+	$(INSTALL) -m 755 $(TARGETS) $(sbindir)
-+
- vrsetup : 	$(vrsetup_OBJ)
- 	$(CC) $(CFLAGS) $(LIBS) $< -o $@ 
- 	strip $@
diff --git a/package/mnemoc/vquota/pkg_conf.in b/package/mnemoc/vquota/pkg_conf.in
deleted file mode 100644
index d5e74c781..000000000
--- a/package/mnemoc/vquota/pkg_conf.in
+++ /dev/null
@@ -1,33 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_conf.in
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# 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; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-echo_status "Including Contexts Quota (vquota) patch..."
-
-pkg_vquota_confdir=$base/package/mnemoc/vquota
-pkg_vquota_archdir=$base/download/mnemoc/vquota
-
-set -x
-pkg_vquota_patchbz2=$( grep "^\[D\]" ${pkg_vquota_confdir}/vquota.desc \
-	| tr ' ' '\t' | tr -s '\t' | cut -f3 | grep -e "^${pkg:0:5}" )
-pkg_vquota_ver=$( sed -n 's,^\[V\] \(.*\),\1,p' ${pkg_vquota_confdir}/vquota.desc )
-set +x
-
diff --git a/package/mnemoc/vquota/pkg_linux24-header_pre.conf b/package/mnemoc/vquota/pkg_linux24-header_pre.conf
deleted file mode 100644
index b0a5e1f24..000000000
--- a/package/mnemoc/vquota/pkg_linux24-header_pre.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_linux24-header_pre.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# 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; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. $base/package/mnemoc/vquota/pkg_linux24_pre.conf
diff --git a/package/mnemoc/vquota/pkg_linux24-src_pre.conf b/package/mnemoc/vquota/pkg_linux24-src_pre.conf
deleted file mode 100644
index 408c2703d..000000000
--- a/package/mnemoc/vquota/pkg_linux24-src_pre.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_linux24-src_pre.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# 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; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. $base/package/mnemoc/vquota/pkg_linux24_pre.conf
diff --git a/package/mnemoc/vquota/pkg_linux24_pre.conf b/package/mnemoc/vquota/pkg_linux24_pre.conf
deleted file mode 100644
index e9b4b4f0e..000000000
--- a/package/mnemoc/vquota/pkg_linux24_pre.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_linux24_pre.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# 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; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. $base/package/mnemoc/vquota/pkg_conf.in
-
-pkg_vquota_patchdir=$( mktemp -d )
-hook_add postpatch  4 "rm -rf $pkg_vquota_patchdir"
-
-pkg_vquota_patchfile=${pkg_vquota_patchdir}/ctx-vquota-${pkg_vquota_ver}.patch
-
-bunzip2 -c "${pkg_vquota_archdir}/${pkg_vquota_patchbz2}" > \
-	${pkg_vquota_patchfile}
-						
-var_append confscripts ' ' "${pkg_vquota_confdir}/kernel.conf.sh"
-var_append patchfiles ' ' "$pkg_vquota_patchfile"
diff --git a/package/mnemoc/vquota/pkg_quota_pre.conf b/package/mnemoc/vquota/pkg_quota_pre.conf
deleted file mode 100644
index e76da9406..000000000
--- a/package/mnemoc/vquota/pkg_quota_pre.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_quota_pre.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# 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; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. $base/package/mnemoc/vquota/pkg_conf.in
-
-pkg_vquota_patchfile=$( mktemp )
-hook_add postpatch  4 "rm -f $pkg_vquota_patchfile"
-
-bunzip2 -c "${pkg_vquota_archdir}/${pkg_vquota_patchbz2}" > $pkg_vquota_patchfile
-
-var_append patchfiles ' ' "$pkg_vquota_patchfile"
diff --git a/package/mnemoc/vquota/pkg_vserver_pre.conf b/package/mnemoc/vquota/pkg_vserver_pre.conf
deleted file mode 100644
index 1d6dfeffe..000000000
--- a/package/mnemoc/vquota/pkg_vserver_pre.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_vserver_pre.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# 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; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. $base/package/mnemoc/vquota/pkg_conf.in
-
-pkg_vquota_patchfile=$( mktemp )
-hook_add postpatch  4 "rm -f $pkg_vquota_patchfile"
-
-bunzip2 -c "${pkg_vquota_archdir}/${pkg_vquota_patchbz2}" > $pkg_vquota_patchfile
-
-var_append patchfiles ' ' "$pkg_vquota_patchfile"
diff --git a/package/mnemoc/vquota/vquota.cache b/package/mnemoc/vquota/vquota.cache
deleted file mode 100644
index 44a2c45b2..000000000
--- a/package/mnemoc/vquota/vquota.cache
+++ /dev/null
@@ -1,34 +0,0 @@
-[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-[COPY] 
-[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-[COPY] Please add additional copyright information _after_ the line containing
-[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-[COPY] 
-[COPY] ROCK Linux: rock-src/package/mnemoc/vquota/vquota.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-[COPY] 
-[COPY] This program is free software; you can redistribute it and/or modify
-[COPY] it under the terms of the GNU General Public License as published by
-[COPY] the Free Software Foundation; either version 2 of the License, or
-[COPY] (at your option) any later version. A copy of the GNU General Public
-[COPY] License can be found at Documentation/COPYING.
-[COPY] 
-[COPY] Many people helped and are helping developing ROCK Linux. Please
-[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-[COPY] file for details.
-[COPY] 
-[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
-
-[TIMESTAMP] 1045899685 Sat Feb 22 04:41:25 2003
-[CONFIG-ID] 1.7-snapshot-x86-pentium3-mnemosyne-expert
-[ROCKVER] 1.7-snapshot
-
-[LOGS] 5-vquota.log 9-vquota.log
-
-[BUILDTIME] 5603 (9)
-[SIZE] 0.04 MB, 9 files
-
-[DEP] bash bzip2 fileutils findutils grep make patch sed sysfiles tar
-[DEP] textutils
-
diff --git a/package/mnemoc/vquota/vquota.desc b/package/mnemoc/vquota/vquota.desc
deleted file mode 100644
index e12e899b2..000000000
--- a/package/mnemoc/vquota/vquota.desc
+++ /dev/null
@@ -1,45 +0,0 @@
-
-[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-[COPY] 
-[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-[COPY] Please add additional copyright information _after_ the line containing
-[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-[COPY] 
-[COPY] ROCK Linux: rock-src/package/mnemoc/vquota/vquota.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-[COPY] 
-[COPY] This program is free software; you can redistribute it and/or modify
-[COPY] it under the terms of the GNU General Public License as published by
-[COPY] the Free Software Foundation; either version 2 of the License, or
-[COPY] (at your option) any later version. A copy of the GNU General Public
-[COPY] License can be found at Documentation/COPYING.
-[COPY] 
-[COPY] Many people helped and are helping developing ROCK Linux. Please
-[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-[COPY] file for details.
-[COPY] 
-[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
-
-[I] VServer Context Quota
-
-[T] This is the first attempt to add per context quota support to the linux
-[T] kernel vserver project (new context, and per-context user/group quota),
-
-[U] http://www.13thfloor.at/VServer/
-
-[A] Herbert Potzl <herbert@13thfloor.at>
-[M] Alejandro Mery <amery@geeks.cl>
-
-[C] extra/security
-
-[L] GPL
-[S] Alpha
-[V] 0.12
-[P] O -----5---9 793.000
-
-[D] 982560686 vquota-tools-0.12.tar.bz2 http://www.13thfloor.at/VServer/
-[D] 4004901191 linux-2.4.21-ctx17-vquota-0.10.diff.bz2 http://www.13thfloor.at/VServer/
-[D] 2125636190 vserver-0.23-cap_quotactl.diff.bz2 http://www.13thfloor.at/VServer/
-[D] 2351796584 quota-tools-3.08-ctx17-v0.35.diff.bz2 http://www.13thfloor.at/VServer/
-
diff --git a/package/mnemoc/vserver/config.in b/package/mnemoc/vserver/config.in
index c3e50e3a8..686ef8374 100644
--- a/package/mnemoc/vserver/config.in
+++ b/package/mnemoc/vserver/config.in
@@ -21,19 +21,24 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 if pkgcheck vserver X; then
+	# if you are using contexts, you don't want to 
+	# use standard quota system.
+	if  pkgcheck quota X; then
+		ROCKCFG_PKG_VSERVER_QUOTA=1
+	fi
+
 block_begin 5
 	comment ' '
 	comment '- Package Options - VServer'
+	if pkgcheck quota; then
 	bool 'Enable Virtual Server per Context Quota Support' ROCKCFG_PKG_VSERVER_QUOTA 0
 	if [ $ROCKCFG_PKG_VSERVER_QUOTA -eq 1 ]; then
-		pkgenable vquota
 		pkgenable quota
 	else
-		pkgdisable vquota
-
-		# if you are using contexts, you don't want to 
-		# use standard quota system.
 		pkgdisable quota
 	fi
+	else
+		comment '-- quota package not found. can`t use vquota.'
+	fi
 block_end
 fi
diff --git a/package/mnemoc/vquota/kernel.conf.sh b/package/mnemoc/vserver/kernel-vquota.conf.sh
similarity index 100%
rename from package/mnemoc/vquota/kernel.conf.sh
rename to package/mnemoc/vserver/kernel-vquota.conf.sh
diff --git a/package/mnemoc/vserver/no_extraversion.diff b/package/mnemoc/vserver/no_extraversion.diff
index 9795575bf..93dfec2da 100644
--- a/package/mnemoc/vserver/no_extraversion.diff
+++ b/package/mnemoc/vserver/no_extraversion.diff
@@ -1,40 +1,21 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mnemoc/vserver/no_extraversion.diff
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# 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; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./ctx17a.diff.orig	2003-09-10 23:37:16.000000000 -0400
-+++ ./ctx17a.diff	2003-09-10 23:38:21.000000000 -0400
-@@ -1,15 +1,3 @@
--diff -NurP --minimal linux-2.4.22/Makefile linux-2.4.22-ctx17a/Makefile
----- linux-2.4.22/Makefile	2003-08-25 03:13:16.000000000 +0200
--+++ linux-2.4.22-ctx17a/Makefile	2003-08-25 03:16:10.000000000 +0200
+--- ./vserver-1.24.patch.orig	2003-12-17 11:04:30.000000000 -0300
++++ ./vserver-1.24.patch	2003-12-17 11:04:47.000000000 -0300
+@@ -13,18 +13,6 @@
+  Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)
+  CONFIG_BLK_DEV_UMEM
+    Saying Y here will include support for the MM5415 family of
+-diff -NurpP --minimal linux-2.4.23/Makefile linux-2.4.23-vs1.22/Makefile
+---- linux-2.4.23/Makefile	Fri Nov 28 19:26:21 2003
+-+++ linux-2.4.23-vs1.22/Makefile	Sat Dec 13 18:42:20 2003
 -@@ -1,7 +1,7 @@
 - VERSION = 2
 - PATCHLEVEL = 4
-- SUBLEVEL = 22
+- SUBLEVEL = 24
 --EXTRAVERSION =
--+EXTRAVERSION = -ctx17a
+-+EXTRAVERSION = -vs1.26
 - 
 - KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 - 
- diff -NurP --minimal linux-2.4.22/arch/i386/kernel/entry.S linux-2.4.22-ctx17a/arch/i386/kernel/entry.S
- --- linux-2.4.22/arch/i386/kernel/entry.S	2003-06-13 16:51:29.000000000 +0200
- +++ linux-2.4.22-ctx17a/arch/i386/kernel/entry.S	2003-08-25 03:16:10.000000000 +0200
+ diff -NurpP --minimal linux-2.4.23/arch/alpha/kernel/entry.S linux-2.4.23-vs1.22/arch/alpha/kernel/entry.S
+ --- linux-2.4.23/arch/alpha/kernel/entry.S	Fri Jun 13 16:51:29 2003
+ +++ linux-2.4.23-vs1.22/arch/alpha/kernel/entry.S	Sat Dec 13 18:42:20 2003
diff --git a/package/mnemoc/vserver/pkg_linux24_pre.conf b/package/mnemoc/vserver/pkg_linux24_pre.conf
index 715e4b586..ce6af323a 100644
--- a/package/mnemoc/vserver/pkg_linux24_pre.conf
+++ b/package/mnemoc/vserver/pkg_linux24_pre.conf
@@ -20,34 +20,37 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-echo_status "Including Security Contexts (vserver) patch..."
-
 pkg_vserver_confdir=$base/package/mnemoc/vserver
 pkg_vserver_archdir=$base/download/mnemoc/vserver
 
-pkg_ctx_patch=$( grep "^\[D\]" ${pkg_vserver_confdir}/vserver.desc | \
-	sed -n "s,.* \(patch-.*ctx[0-9][0-9].*\.diff\.bz2\) .*,\1,p" )	
-pkg_ctx_jacques=$( grep "^\[D\]" ${pkg_vserver_confdir}/vserver.desc | \
-	sed -n "s,.* \(jacques-ctx[0-9][0-9].*\.diff\.bz2\) .*,\1,p" )
+# tempdir
+pkg_ctx_tempdir=`mktemp -d`
+hook_add postpatch 6 "rm -rf $pkg_ctx_tempdir"
 
-# fetch version from patchfile
-pkg_ctx_ver=${pkg_ctx_patch#*ctx};
-pkg_ctx_ver=${pkg_ctx_ver%.diff.bz2};
+# prepare vserver patch
+pkg_ctx_patch=$( grep  "^\[D\] .* patch[^ ]*-vs[0-9\.]*.diff.bz2"  ${pkg_vserver_confdir}/vserver.desc | \
+	cut -d' ' -f3 )
+pkg_ctx_ver=$( echo $pkg_ctx_patch | sed -n -e 's,.*-vs\(.*\).diff.bz2,\1,p' )
 
-# get a patched ctx's patch.
-pkg_ctx_tempdir=`mktemp -d`
 bzip2 -d -c $pkg_vserver_archdir/$pkg_ctx_patch \
-	> $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch
-if [ "$pkg_ctx_jacques" ]; then
-	bzip2 -d -c $pkg_vserver_archdir/$pkg_ctx_jacques \
-		> $pkg_ctx_tempdir/jacques-update.patch
-	patch $patchopt $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch \
-		$pkg_ctx_tempdir/jacques-update.patch}
-fi
-patch $patchopt $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch \
+	> $pkg_ctx_tempdir/vserver-$pkg_ctx_ver.patch
+patch $patchopt $pkg_ctx_tempdir/vserver-$pkg_ctx_ver.patch \
 	${pkg_vserver_confdir}/no_extraversion.diff > /dev/null
 
-hook_add postpatch 6 "rm -rf $pkg_ctx_tempdir"
+echo_status "Including Security Contexts (vserver-$pkg_ctx_ver) patch..."
+var_append patchfiles ' ' $pkg_ctx_tempdir/vserver-$pkg_ctx_ver.patch
+
+if [ "$ROCKCFG_PKG_VSERVER_QUOTA" = "1" ]; then
+	# prepare vquota patch
+	pkg_vquota_patch=$( grep "^\[D\] .* patch[^ ]*-q.*.diff.bz2" ${pkg_vserver_confdir}/vserver.desc | \
+		cut -d' ' -f3 )
+	pkg_vquota_ver=$( echo $pkg_vquota_patch | sed -n -e 's,.*-q\(.*\).diff.bz2,\1,p' )
+
+	bzip2 -d -c $pkg_vserver_archdir/$pkg_vquota_patch \
+		> $pkg_ctx_tempdir/vquota-$pkg_vquota_ver.patch
+
+	echo_status "Including Per Context Quota/Disk Limits support (vquota-$pkg_vquota_ver) patch..."
+	var_append patchfiles ' ' $pkg_ctx_tempdir/vquota-$pkg_vquota_ver.patch
+	var_append conffiles  ' ' $pkg_ctx_confdir/kernel-vquota.conf.sh
+fi
 
-# it SHALL be before vquota patch
-var_insert_before_regex patchfiles ' ' $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch '.*\/ctx-vquota.*'
diff --git a/package/mnemoc/vserver/vserver.cache b/package/mnemoc/vserver/vserver.cache
index 25cc33e2f..d3371a58f 100644
--- a/package/mnemoc/vserver/vserver.cache
+++ b/package/mnemoc/vserver/vserver.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/mnemoc/vserver/vserver.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,15 +20,16 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1064498429 Thu Sep 25 10:00:29 2003
-[CONFIG-ID] 2.0.0-rc2-x86-pentium2-32-mnemosyne-expert
-[ROCKVER] 2.0.0-rc2
+[TIMESTAMP] 1076952547 Mon Feb 16 14:29:07 2004
+[CONFIG-ID] 2.0.0-rc5-x86-pentium4-32-mnemosyne-expert
+[ROCKVER] 2.0.0-rc5
 
 [LOGS] 5-vserver.log 9-vserver.log
 
-[BUILDTIME] 10876 (9)
-[SIZE] 0.93 MB, 84 files
+[BUILDTIME] 2455 (9)
+[SIZE] 0.59 MB, 104 files
 
-[DEP] bash binutils bzip2 coreutils findutils gcc33 glibc23 grep
-[DEP] linux24-header make sed sysfiles tar vserver
+[DEP] 00-dirtree bash binutils bzip2 ccache coreutils diffutils e2fsprogs
+[DEP] findutils gcc33 glibc23 grep linux24-header linux24-src make mktemp
+[DEP] net-tools sed sysfiles tar util-linux
 
diff --git a/package/mnemoc/vserver/vserver.conf b/package/mnemoc/vserver/vserver.conf
new file mode 100644
index 000000000..856e8d4fe
--- /dev/null
+++ b/package/mnemoc/vserver/vserver.conf
@@ -0,0 +1,27 @@
+vserver_cqtools() {
+	cd $builddir
+	tar $taropt $archdir/$( echo "$desc_D" | grep " cq-tools-" | cut -d' ' -f2 )
+	cd cq-tools-*
+	make all
+	cp -vdf $( grep 'all:' Makefile | cut -f2 ) $sbindir
+}
+vserver_vrtools() {
+	cd $builddir
+	tar $taropt $archdir/$( echo "$desc_D" | grep " vr-tools-" | cut -d' ' -f2 )
+	cd vr-tools-*
+	make vrsetup
+	cp -vf vrsetup $sbindir
+}
+vserver_vproc() {
+	cd $builddir
+	tar $taropt $archdir/$( echo "$desc_D" | grep " vproc-" | cut -d' ' -f2 )
+	cd vproc-*
+	make vproc
+	cp -vf vproc $sbindir
+}
+
+if [ "$ROCKCFG_PKG_VSERVER_QUOTA" = "1" ]; then
+	hook_add postdoc 6 'vserver_vrtools; vserver_cqtools' 
+fi
+hook_add postdoc 5 'vserver_vproc'
+
diff --git a/package/mnemoc/vserver/vserver.desc b/package/mnemoc/vserver/vserver.desc
index 22fee2c3c..563307c31 100644
--- a/package/mnemoc/vserver/vserver.desc
+++ b/package/mnemoc/vserver/vserver.desc
@@ -31,8 +31,9 @@
 [T] database and root password. Each vserver uses standard packages and runs
 [T] at the same speed as a non-VServer installation. 
 [T]
-[T] WARNING! this will disable your JFS support, probably until ctx18.
+[T] Optionaly supports per context Quota/Disk limits
 
+[U] http://www.13thfloor.at/vserver/project/
 [U] http://www.solucorp.qc.ca/miscprj/s_context.hc
 
 [A] Jacques Gelinas <jack@solucorp.qc.ca>
@@ -43,10 +44,13 @@
 
 [L] GPL
 [S] Stable
-[V] 0.23
+[V] 1.26
 [P] O -----5---9 788.000
 
-[CV-DEL] \.src\.tar\.gz$ ^[^0-9]+ .*\.rpm$ 
+[D] 3856816474 util-vserver-0.29.tar.bz2 http://www-user.tu-chemnitz.de/~ensc/util-vserver/
+[D] 1566762326 vproc-0.01.tar.bz2 http://www.13thfloor.at/vserver/s_release/v1.26/
+[D] 3365204218 cq-tools-0.06.tar.bz2 http://www.13thfloor.at/vserver/s_addons/quota/
+[D] 1901557901 vr-tools-0.14.tar.bz2 http://www.13thfloor.at/vserver/s_addons/vroot/
+[D] 3762799947 patch-2.4.24-vs1.26.diff.bz2 http://www.13thfloor.at/vserver/s_release/v1.26/
+[D] 732425666 patch-2.4.24-vs1.26-q0.13.diff.bz2 http://www.13thfloor.at/vserver/s_addons/quota/
 
-[D] 1609639113 vserver-0.23.src.tar.gz ftp://ftp.solucorp.qc.ca/pub/vserver/
-[D] 1431776533 patch-2.4.22-ctx17a.diff.bz2 http://www.13thfloor.at/VServer/