diff --git a/.travis.yml b/.travis.yml
index e0169a6e..5f74e075 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,4 +12,14 @@ script:
   - make -C libopencm3 lib
   - make -C src all_platforms
 
-
+deploy:
+  provider: s3
+  access_key_id: AKIAIDXRMRPEG5OCN5AQ
+  secret_access_key:
+    secure: pPm0GQg4Y37teFzJQYsGkwn4QAdgFw+vOmQKw3dtcs0Jok7Jhybu3zr2Q3dEVuUN6EXG6AKHZVVEJA+TPo0VfC9rXZRniukp5ZhVw2capX3bkfXe9AbUQGKs7v6uAD42ZiPLx6i1KjlVcM2qgy9IhZHm6rYAiVN0PKIwY+rduzCpEXdJNkHVvKvKnUKxc+ivNQ8FDUezed83QCCohizFNTHYZkkPwZIy1jeg6KE7/7S2L1nZFacFStPHAvM99wMqxBVO7CqgBmFG3E+EFzd7XtfY7WJy/pdXHvrUpN/vniWRfri//xQAzYIgtthQDcNkyjwKHjHJsFnfcULAH/bPYXF9cxeYiqppDrR6wj3NedU3nXngTuyTO96m9u/aSWNNyvE/yPisgrJ2G5Kf5lbriuK/ftVrQxGyF8gsm0ny5IMisL7k/8CaYi++BFH+JHR3fHSCUWpqNh2nyIdrvphH3grLRUXfGhNoFCUoG3gzEL0OIL/lqNIHStWTCtvk2U+pe5P9oKg/15quUO/+MkN3k2brzpImZuPWwlXwYHSFFx59GcQN/delp+yWOnQmqpwzGltvbdhPtfnk8NCA1mRBzsFqZjQYi3h2LdsfKuiU0MbUZ0YMjWUKf2EjxZvsnO8HL+lDcXkuzDUd3uY7j+IF+K7ZYe0wWYv5JfnRiM9Y+kM=
+  skip_cleanup: true
+  bucket: builds.blacksphere.co.nz
+  acl: public_read
+  region: us-west-2
+  local_dir: src/artifacts
+  upload-dir: blackmagic-travis-builds
diff --git a/src/Makefile b/src/Makefile
index abd86932..fd5406f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -86,6 +86,7 @@ clean:	host_clean
 
 all_platforms:
 	$(Q)set -e ;\
+	mkdir -p artifacts ;\
 	for i in platforms/*/Makefile.inc ; do \
 		export DIRNAME=`dirname $$i` ;\
 		export PROBE_HOST=`basename $$DIRNAME` ;\
@@ -94,7 +95,7 @@ all_platforms:
 		$(MAKE) $(MAKEFLAGS) clean ;\
 		$(MAKE) $(MAKEFLAGS);\
 		if [ -f blackmagic.bin ]; then \
-			mv blackmagic.bin blackmagic-$$PROBE_HOST.bin ;\
+			mv blackmagic.bin artifacts/blackmagic-$$PROBE_HOST.bin ;\
 		fi ;\
 	done
 
@@ -103,4 +104,3 @@ include/version.h: FORCE
 	$(Q)echo "#define FIRMWARE_VERSION \"`git describe --dirty`\"" > $@
 
 -include *.d
-