diff --git a/.gitignore b/.gitignore
index 9e270ad..189d7da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 composer.phar
 composer.lock
-vendor/
\ No newline at end of file
+vendor/
+build/
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index f58ba0d..0ac4a51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ cache:
   directories:
     - $HOME/.composer/cache
     - vendor
+    - build
 
 php:
   - 5.4
@@ -36,9 +37,7 @@ matrix:
       - php: hhvm
 
 install:
-  - cd build
   - bash build.sh $TASKWARRIOR
-  - cd ..
   - ln -s build/taskwarrior-$TASKWARRIOR task
   - chmod +x ./task
   - ./task --version
diff --git a/build/build.sh b/build.sh
old mode 100755
new mode 100644
similarity index 58%
rename from build/build.sh
rename to build.sh
index 67957cd..ce55278
--- a/build/build.sh
+++ b/build.sh
@@ -2,7 +2,15 @@
 
 TASKWARRIOR=$1
 
-wget http://taskwarrior.org/download/task-$TASKWARRIOR.tar.gz
+[ -d build ] || mkdir build
+
+if [ -f build/taskwarrior-$TASKWARRIOR ]
+  then
+    exit;
+fi
+
+cd build
+wget http://taskwarrior.org/download/task-$TASKWARRIOR.tar.gz || exit
 gunzip task-$TASKWARRIOR.tar.gz
 tar xf task-$TASKWARRIOR.tar
 cd task-$TASKWARRIOR
@@ -11,3 +19,4 @@ make
 cd ..
 cp task-$TASKWARRIOR/src/task ./taskwarrior-$TASKWARRIOR
 sudo rm -Rf task-$TASKWARRIOR*
+cd ..
\ No newline at end of file
diff --git a/build/taskwarrior-2.5.0 b/build/taskwarrior-2.5.0
deleted file mode 100755
index a3a51fa..0000000
Binary files a/build/taskwarrior-2.5.0 and /dev/null differ