diff --git a/security/vserver/vserver.conf b/security/vserver/vserver.conf
index 0e6af75aa..950e4ba3a 100644
--- a/security/vserver/vserver.conf
+++ b/security/vserver/vserver.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../vserver/vserver.conf
-# Copyright (C) 2006 The T2 SDE Project
+# Copyright (C) 2009 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -12,5 +12,18 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-autoextract=0
-custmain=true
+# vcmd doesn't `make install`
+makeinstopt=
+hook_add postmake 4 "cp -v vcmd '$root$bindir/'"
+
+# install test scripts
+vserver_tests() {
+	local x=
+	echo "Installing test*.sh scripts..."
+	for x in testme testfs; do
+		cp -v $(match_source_file -p $x ) "$root$docdir/$x.sh"
+		chmod +x "$root$docdir/$x.sh"
+	done
+}
+
+hook_add postmake 5 "vserver_tests"
diff --git a/security/vserver/vserver.desc b/security/vserver/vserver.desc
index a46bdf851..a7add954a 100644
--- a/security/vserver/vserver.desc
+++ b/security/vserver/vserver.desc
@@ -41,6 +41,10 @@
 [V] 2.3.0.36.4
 [P] O -?---5---9 190.200
 
+[D] 3929046219 vcmd-0.13.tar.bz2 http://vserver.13thfloor.at/Experimental/TOOLS/
+[D] 1130625335 testme.sh-0.17 http://vserver.13thfloor.at/Stuff/SCRIPT/
+[D] 2865374499 testfs.sh-0.20 http://vserver.13thfloor.at/Stuff/SCRIPT/
+
 [D] 3641118826 patch-2.6.27.13-vs2.3.0.36.4.diff http://vserver.13thfloor.at/Experimental/
 #[D] 3524913094 patch-2.6.22.19-vs2.2.0.7.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/