diff --git a/conf/jcs/jcs.conf b/conf/jcs/jcs.conf
index f2b13d43..ae1f5f5d 100644
--- a/conf/jcs/jcs.conf
+++ b/conf/jcs/jcs.conf
@@ -1,4 +1,4 @@
-jcs_dir=$HOME/local/src/jw.dev/conf/janware/`hostname -s`/`/opt/jw-build/bin/get-os.sh`
+jcs_dir=$HOME/local/src/jw.dev/conf/`sed 's|\([^.]\+\)\.\(.*\)|\2/\1|' /etc/hostname`/`/opt/jw-build/bin/get-os.sh`
 jcs_owner=root
 jcs_group=root
 jcs_log_dir=$jcs_dir/log
diff --git a/scripts/jcs b/scripts/jcs
index 252ce09b..df0e8551 100644
--- a/scripts/jcs
+++ b/scripts/jcs
@@ -2037,7 +2037,7 @@ JNT_JCSDIR=/tmp
 --<<<-- jcs.conf.oldstyle --
 
 -->>>-- jcs.conf --
-jcs_dir=$HOME/local/src/jw.dev/conf/`hostname -d`/`hostname -s`/`/opt/jw-build/bin/get-os.sh`
+jcs_dir=$HOME/local/src/jw.dev/conf/`sed 's|\([^.]\+\)\.\(.*\)|\2/\1|' /etc/hostname`/`/opt/jw-build/bin/get-os.sh`
 jcs_owner=root
 jcs_group=root
 jcs_log_dir=$jcs_dir/log