diff --git a/INSTALL_CENTOS_5.2.txt b/INSTALL_CENTOS_5.2.txt
index 89ce78a928d96f59193955321ed27cea37fed251..f3821e8a0a90a202da833ef3fe22dae342a4f5a7 100644
--- a/INSTALL_CENTOS_5.2.txt
+++ b/INSTALL_CENTOS_5.2.txt
@@ -221,11 +221,14 @@ done
 
 Installing Jailkit:
 
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
 cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
 ./configure
 make
 make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/INSTALL_DEBIAN_4.0.txt b/INSTALL_DEBIAN_4.0.txt
index 3e9ec963d372b1efe816be65dda5150000f2d151..a24c7a4a1a6124b0cb35661b2afa59382d365e1d 100644
--- a/INSTALL_DEBIAN_4.0.txt
+++ b/INSTALL_DEBIAN_4.0.txt
@@ -162,12 +162,15 @@ done
 
 Installing Jailkit:
 
-apt-get install build-essential autoconf automake1.9 libtool flex bison
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
+apt-get install build-essential autoconf automake1.9 libtool flex bison nano cvs
 cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
 ./configure
 make
 make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/INSTALL_FEDORA_9.txt b/INSTALL_FEDORA_9.txt
index b91003dff5191df8e5864ad5f441e1d3860178ad..f499f3fd12394a02a2a41a30f225d4c5cb42b2f8 100644
--- a/INSTALL_FEDORA_9.txt
+++ b/INSTALL_FEDORA_9.txt
@@ -204,11 +204,14 @@ done
 
 Installing Jailkit:
 
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
 cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
 ./configure
 make
 make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/INSTALL_OPENSUSE_11.txt b/INSTALL_OPENSUSE_11.txt
index f76dd41f2d8f3fabfb4183cc05bbd59e902d62cc..3912ff3cb8bae87fbab568de5501a55389969737 100644
--- a/INSTALL_OPENSUSE_11.txt
+++ b/INSTALL_OPENSUSE_11.txt
@@ -189,11 +189,14 @@ done
 
 Installing Jailkit:
 
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
 cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
 ./configure
 make
 make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/INSTALL_UBUNTU_8.04.txt b/INSTALL_UBUNTU_8.04.txt
index c3ba560e667f211dc2061c7d6fd1df628336f231..6c064e301147f7c0b7fe843ad976f6965dff707b 100644
--- a/INSTALL_UBUNTU_8.04.txt
+++ b/INSTALL_UBUNTU_8.04.txt
@@ -217,13 +217,16 @@ In case you get a permission denied error from apache, please restart the apache
 
 Installing Jailkit:
 
-apt-get install build-essential autoconf automake1.9 libtool flex bison
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
+apt-get install build-essential autoconf automake1.9 libtool flex bison nano cvs
 cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
 ./configure
 make
 make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
 
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 3996d690a184739e3beacb8ce06b7d807660938c..3ae2ef24d01b99bccd11c49d440737f9a31dcbaf 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -91,7 +91,7 @@ class shelluser_base_plugin {
 			$command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
 			// $command .= ' --non-unique ';
 			$command .= ' --password '.escapeshellcmd($data['new']['password']);
-			$command .= ' --shell '.escapeshellcmd($data['new']['shell']);
+			if($data['new']['chroot'] != 'jailkit') $command .= ' --shell '.escapeshellcmd($data['new']['shell']);
 			// $command .= ' --uid '.escapeshellcmd($uid);
 			$command .= ' --login '.escapeshellcmd($data['new']['username']);
 			$command .= ' '.escapeshellcmd($data['old']['username']);