diff --git a/scripts/jcs b/scripts/jcs
index c06e7520..0a41ad95 100644
--- a/scripts/jcs
+++ b/scripts/jcs
@@ -1613,12 +1613,16 @@ jcs_touch() {
 }
 
 jcs_setup() {
-	if [ -d "$cfg_jcs_dir" ]; then
-		cd $cfg_jcs_dir
-		if [ -d CVS ]; then
-			cvs update -dP
-		fi
-		make setup
+	local cvs_dir=`echo $cfg_jcs_dir | sed 's%/conf/.*%%'`
+	local cvs_mod=`echo $cfg_jcs_dir | sed 's%.*/conf/%conf/%'`
+	if [ "$cvs_dir" -a "$cvs_mod" ]; then
+		(
+			mkdir -p $cvs_dir || return 1
+			cd $cvs_dir 
+			cvs checkout -P $cvs_mod || return 1
+			cd $cvs_mod
+			make setup
+		)
 	fi
 }