diff --git a/.travis.yml b/.travis.yml
index 76fa140..fc493e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,35 +89,16 @@ before_script: |
  brew install rsync gcc git gnupg flex bison gperf gperftools m4 zip unzip curl zlib docbook-xsl gettext texinfo texi2html
  fi
 script: |
- build()
- {
- (
-   echo "danio-gcc32"
-   ./danio_gcc.sh ${t} 32
-   for i in `ls out | sort`; do
-   sshpass -p "${passwd}" rsync -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" -Pv out/${i} ${login}@${url}:/home/frs/project/danio-gcc/32bits
-   done
-   echo "danio-gcc64"
-   ./danio_gcc.sh ${t} 64
-   for i in `ls out | sort`; do
-   sshpass -p "${passwd}" rsync -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" -Pv out/${i} ${login}@${url}:/home/frs/project/danio-gcc/64bits
-   done
- ) &
- local build_pid=$!
- {
-  while :; do
-   sleep 300
-   printf "Builder is still running...\r"
-  done
- } &
- local runner_pid=$!
- wait $build_pid 2>/dev/null
- local result=$?
- kill $runner_pid
- wait $runner_pid 2>/dev/null
- return $result
- }
- build
-
+ echo "danio-gcc32"
+ travis_wait ./danio_gcc.sh ${t} 32
+ for i in `ls out | sort`; do
+ sshpass -p "${passwd}" rsync -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" -Pv out/${i} ${login}@${url}:/home/frs/project/danio-gcc/32bits
+ done
+ echo "danio-gcc64"
+ travis_wait ./danio_gcc.sh ${t} 64
+ for i in `ls out | sort`; do
+ sshpass -p "${passwd}" rsync -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" -Pv out/${i} ${login}@${url}:/home/frs/project/danio-gcc/64bits
+ done
+ 
 after_failure:
  - grep "Error:" logs/*.log