diff --git a/.travis.yml b/.travis.yml
index 61ca24142..e09d87ae2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ addons:
       - graphviz
 
 cache:
+  apt: true
   directories:
     - thirdparty
 
diff --git a/Makefile b/Makefile
index 36b054d80..740bbf822 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@
 
 PREFIX=$(PWD)/thirdparty
 
+COMMIT=$(shell git rev-parse --short HEAD)
+
 .PHONY: dependencies build deploy test doc clean libnl3 libconfig
 
 clean:
@@ -44,4 +46,7 @@ test:
 
 # Deploy
 deploy:
-	echo "Nothing to do here yet"
\ No newline at end of file
+	tar czf s2ss-$(COMMIT)-docs.tar.gz documentation/html/
+	tar czf s2ss-$(COMMIT).tar.gz server/server server/test server/send server/receive server/random server/etc/
+	rsync *.tar.gz $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/
+	rsync --archive --delete documentation/html/ $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/doc/
\ No newline at end of file