diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh
index ce9614fb169c2a22dc5a91a3607e39613a8a4f9d..36fed5e82ff4340ac6cae90d1e732661a24c022c 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -1,42 +1,31 @@
 #!/bin/bash
-#####################################################
-# File Name: launch-build-machine-jenkins.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-10-20
-# Last Modified: 2010-04-22 16:42:57 -0400
-#####################################################
+# run with --help for documentation
 
 set -x
+set -e
 
 #Check dependencies
 
-# Download the KDE client release script
-if  ! command -v curl ; then
-   echo Please install curl
-   exit 1
-fi
-# Merge the KDE translation files
-if  ! command -v ruby ; then
-   echo Please install ruby
-   exit 1
-fi
-# Download the KDE client and scripts
-if  ! command -v git ; then
-   echo Please install git
-   exit 1
-fi
-# Fetch KDE translations, the gnome client use bzr
-if  ! command -v svn ; then
-   echo Please install svn
-   exit 1
-fi
+for cmd in curl ruby git svn
+do
+    if ! command -v $cmd; then
+        echo "$cmd is missing" >&2
+        exit 1
+    fi
+done
 
+source $(dirname $0)/setenv.sh
 
-. `dirname $0`/setenv.sh
+# Update KDE client
+# $WORKSPACE is declared in setenv.sh
+cd "$WORKSPACE"
+curl -O https://projects.kde.org/projects/playground/network/sflphone-kde/repository/revisions/master/raw/data/config.ini
+curl -O https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts/repository/revisions/master/raw/createtarball/create_tarball.rb
+ruby create_tarball.rb -n -a sflphone-kde
+rm -rf kde
+rm -rf sflphone-kde-*.tar.*
+rm create_tarball.rb config.ini
+mv sflphone-kde-* kde
 
 IS_RELEASE=
 VERSION_INDEX="1"
@@ -50,11 +39,11 @@ VERSION_NUMBER="1.4.1"
 
 LAUNCHPAD_PACKAGES=("sflphone-daemon" "sflphone-kde" "sflphone-gnome" "sflphone-plugins" "sflphone-daemon-video" "sflphone-gnome-video")
 
-echo
-echo "    /***********************\\"
-echo "    | SFLPhone build system |"
-echo "    \\***********************/"
-echo
+cat << EOF
+_________________________
+| SFLPhone build system |
+-------------------------
+EOF
 
 
 for PARAMETER in $*
@@ -308,16 +297,6 @@ END
 	cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog
 done
 
-# if push is activated
-#if [[ ${DO_PUSH} && ${IS_RELEASE} ]];then
-#	echo " Doing commit"
-#	git commit -m "[#1262] Released ${SOFTWARE_VERSION}" .
-#
-#	echo " Pushing commit"
-#	git push origin release
-#fi
-
-
 # Archive source tarball for Debian maintainer
 . ${WORKING_DIR}/build_tarball.sh ${SOFTWARE_VERSION}
 
diff --git a/tools/build-system/setenv.sh b/tools/build-system/setenv.sh
index ece19f82c0aea5ce45208720432b78783cae004f..bc5e43966bdb50445e0876ffc594c6c5d3a4a3ed 100755
--- a/tools/build-system/setenv.sh
+++ b/tools/build-system/setenv.sh
@@ -1,15 +1,5 @@
 #!/bin/bash
-#####################################################
-# File Name: setenv.sh
-#
-# Purpose : Export environment variables for launch-build-machine-jenkins.sh script.
-#           Fetch the latest KDE client code from KDE repository
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-12-15
-# Last Modified: 2014-03-21 13:16:52 -0500
-#####################################################
+# Export environment variables for launch-build-machine-jenkins.sh script.
 
 # home directory
 export ROOT_DIR=${HOME}
@@ -22,23 +12,8 @@ export EDITOR="echo"
 export REFERENCE_REPOSITORY="${WORKSPACE}"
 
 # In case the script is executed manually, replace the variables set by Jenkins
-if [ "${WORKSPACE}" == "" ]; then
-   WORKSPACE="."
-fi
+WORKSPACE=${WORKSPACE:=.}
 
 export WORKING_DIR="${WORKSPACE}/tools/build-system"
 export LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
-LAUNCHPAD_DISTRIBUTIONS=("trusty utopic")
-export LAUNCHPAD_DISTRIBUTIONS
-
-# Update KDE client
-cd ${WORKSPACE}
-rm -rf config.ini
-rm -rf kde
-curl https://projects.kde.org/projects/playground/network/sflphone-kde/repository/revisions/master/raw/data/config.ini > config.ini
-git clone http://anongit.kde.org/kde-dev-scripts
-ruby kde-dev-scripts/createtarball/create_tarball.rb -n -a sflphone-kde
-rm -rf kde-dev-scripts
-tar -xpvf sflphone-kde-*.tar.*
-rm -rf sflphone-kde-*.tar.*
-mv sflphone-kde-* kde
+export LAUNCHPAD_DISTRIBUTIONS=("trusty utopic")