diff --git a/Makefile b/Makefile
index 9f430ab..732668b 100644
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ coverage:
 		coverage run --source=src/thingpin -m py.test
 		coverage html
 
-scp: build deb
-	scp dist/*.deb dist/*.tar.gz pi@pi2a.local:~/
+scp: deb
+	scp $(DEB_PACKAGE) pi@pi2a.local:~/
 
 deb: build
 	fpm -s dir -t deb -a all \
@@ -72,8 +72,9 @@ deb: build
   		--depends runit \
   		--template-scripts \
   		--after-install src/misc/fpm-after-install.sh \
-  		`ls dist/*.tar.gz`=/tmp/$(NAME)-$(VERSION).tar.gz	 \
-   	    src/examples/etc/=/etc/
+  		`ls dist/*.tar.gz`=/tmp/$(NAME)-$(VERSION).tar.gz \
+  		src/examples/etc/thingpin/=/etc/thingpin/ \
+   	    src/examples/etc/service/thingpin/=/tmp/thingpin-service/
 
 gemfury-upload:
 	curl -F package=@$(DEB_PACKAGE) https://push.fury.io/$(GEMFURY_API_TOKEN)/
diff --git a/src/misc/fpm-after-install.sh b/src/misc/fpm-after-install.sh
index 2b54c9d..9fff69c 100644
--- a/src/misc/fpm-after-install.sh
+++ b/src/misc/fpm-after-install.sh
@@ -5,3 +5,5 @@ pip2 install /tmp/<%= name %>-<%= version %>.tar.gz
 
 echo "Install Adafruit IO client package..."
 pip2 install https://github.com/adafruit/io-client-python/zipball/65320a3a
+
+mv /tmp/thingpin-service /etc/service/thingpin