diff --git a/contrib/rh-jenkins/jenkins_script.sh b/contrib/rh-jenkins/jenkins_script.sh
old mode 100644
new mode 100755
index 9b0f56a07c..47d5380dd0
--- a/contrib/rh-jenkins/jenkins_script.sh
+++ b/contrib/rh-jenkins/jenkins_script.sh
@@ -5,12 +5,18 @@ get_timestamp() {
     date --utc '+%Y%m%d-%H%M%S'
 }
 log_timestamp() {
-    echo "STARTING_NEXT_PHASE: `get_timestamp`"
+    printf "%s%s %s -- %s\n" ">>" ">>" "$(get_timestamp)" "$*"
 }
 DATE="`get_timestamp`"
 REPO=ssh://Jenkins-nm-user/var/lib/git/NetworkManager.git
 
+MAKE_JOBS="-j $((3 * $(grep -c ^processor /proc/cpuinfo || echo 1)))"
+
 git_notes() {
+    if [[ "$GIT_NOTES_DISABLED" == true ]]; then
+        return 0
+    fi
+
     git fetch "$REPO" +refs/notes/test:refs/notes/test || git update-ref -d refs/notes/test
 
     # git-notes append adds a newline so merge them by hand...
@@ -47,43 +53,58 @@ temporary_workaround_01() {
     fi
 }
 
-log_timestamp
-git reset --hard HEAD
-git clean -fdx
-git submodule foreach git clean -fdx
-git submodule update
+clean_all() {
+    git reset --hard HEAD
+    git clean -fdx
+    git submodule foreach git reset --hard HEAD
+    git submodule foreach git clean -fdx
+    git submodule update
 
-temporary_workaround_01
+    temporary_workaround_01
+}
 
 
-#export CFLAGS="-Wall -g -O0 -fstack-protector-strong -Wno-deprecated-declarations"
-# yum install ppp-devel polkit-devel vala-compat-tools gcc-c++
+if [[ "$OUT_OF_TREE_BUILD" == true ]]; then
+    log_timestamp "Starting out of tree build"
+    clean_all
 
+    ./autogen.sh
+    make distclean
+
+    mkdir _build
+    pushd _build
+        ../configure --enable-maintainer-mode --prefix=$PWD/.INSTALL/ --with-dhclient=yes --with-dhcpcd=yes --with-crypto=nss --enable-more-warnings=error --enable-ppp=yes --enable-polkit=yes --with-session-tracking=systemd --with-suspend-resume=systemd --with-tests=yes --enable-tests=yes --with-valgrind=yes --enable-ifcfg-rh=yes --enable-ifupdown=yes --enable-ifnet=yes --enable-gtk-doc --enable-qt=yes --with-system-libndp=no --enable-static=libndp --enable-bluez4=no --enable-wimax=no --enable-vala=no --enable-modify-system=no
+        make $MAKE_JOBS
+    popd
+
+    log_timestamp "Finished out of tree build"
+fi
+
+log_timestamp "start build"
+clean_all
 
 log_timestamp
 ./autogen.sh --enable-maintainer-mode --prefix=$PWD/.INSTALL/ --with-dhclient=yes --with-dhcpcd=yes --with-crypto=nss --enable-more-warnings=error --enable-ppp=yes --enable-polkit=yes --with-session-tracking=systemd --with-suspend-resume=systemd --with-tests=yes --enable-tests=yes --with-valgrind=yes --enable-ifcfg-rh=yes --enable-ifupdown=yes --enable-ifnet=yes --enable-gtk-doc --enable-qt=yes --with-system-libndp=no --enable-static=libndp --enable-bluez4=no --enable-wimax=no --enable-vala=no --enable-modify-system=no
 
-
 log_timestamp
-make
-
+make $MAKE_JOBS
 
 log_timestamp
 make check
 
-
 log_timestamp
 make distcheck
 
 
-log_timestamp
 if [[ "$RPM" == true ]]; then
+    log_timestamp "start making RPM"
     wget http://file.brq.redhat.com/~thaller/nmtui-0.0.1.tar.xz
     git checkout origin/automation -- :/contrib/
     ./contrib/rpm/build.sh
+    log_timestamp "finished making RPM"
 fi
 
 
-log_timestamp
+log_timestamp "finished with success"
 git_notes_ok
 
diff --git a/contrib/rh-jenkins/trigger_build.sh b/contrib/rh-jenkins/trigger_build.sh
index ad8f543742..6b94518882 100755
--- a/contrib/rh-jenkins/trigger_build.sh
+++ b/contrib/rh-jenkins/trigger_build.sh
@@ -62,8 +62,14 @@ for i in ${!ARGV[@]}; do
             -C|--no-check-upstream)
                 NO_CHECK_UPSTREAM=yes
                 ;;
+            -o|--out-of-tree)
+                OUT_OF_TREE_BUILD=yes
+                ;;
+            -O|--no-out-of-tree)
+                OUT_OF_TREE_BUILD=no
+                ;;
             -h|--help|'-?')
-                echo "$0 [ -h | -r|--rpm|-R|--no-rpm | -n|--dry-run|--test|-N|-f|--no-test|--force | -c|--check-upstream|-C|--no-check-upstream ] [--] REFS"
+                echo "$0 [ -h | -r|--rpm|-R|--no-rpm | -n|--dry-run|--test|-N|-f|--no-test|--force | -c|--check-upstream|-C|--no-check-upstream | -o|--out-of-tree|-O|--no-out-of-tree ] [--] REFS"
                 exit 1
                 ;;
             --)
@@ -82,6 +88,14 @@ else
     NO_CHECK_UPSTREAM=no
 fi
 
+if eval_bool "$OUT_OF_TREE_BUILD" 0; then
+    OUT_OF_TREE_BUILD=yes
+    _OUT_OF_TREE_BUILD=true
+else
+    OUT_OF_TREE_BUILD=no
+    _OUT_OF_TREE_BUILD=false
+fi
+
 if eval_bool "$DRY_RUN" 1; then
     DRY_RUN=yes
 else
@@ -105,6 +119,7 @@ echo "TOKEN                 : \"$_TOKEN\""
 echo "DRY_RUN               : $DRY_RUN"
 echo "RPM                   : $RPM"
 echo "NO_CHECK_UPSTREAM     : $NO_CHECK_UPSTREAM"
+echo "OUT_OF_TREE_BUILD     : $OUT_OF_TREE_BUILD"
 
 
 for _BRANCH in "${REFS[@]}"; do
@@ -134,7 +149,7 @@ for _BRANCH in "${REFS[@]}"; do
     if [[ -n "$CAUSE" ]]; then
         URL_CAUSE="&cause=`url_encode "$CAUSE"`"
     fi
-    _URL="http://10.34.131.51:8080/job/NetworkManager/buildWithParameters?token=`url_encode "$_TOKEN"`$URL_CAUSE&BRANCH=`url_encode "$_B"`&RPM=$_RPM"
+    _URL="http://10.34.131.51:8080/job/NetworkManager/buildWithParameters?token=`url_encode "$_TOKEN"`$URL_CAUSE&BRANCH=`url_encode "$_B"`&RPM=$_RPM&OUT_OF_TREE_BUILD=$_OUT_OF_TREE_BUILD"
     echo
     echo "BRANCH[$i0]  : \"$_BRANCH\" ($_B)"
     echo "CAUSE[$i0]   : \"$CAUSE\""