diff --git a/.gitignore b/.gitignore
index e72dd00..dd2baa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ modbustcp
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+modbus-demo-*.tar.bz2
+modbus-demo-*
diff --git a/Makefile b/Makefile
index 565a44c..a2d1056 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,13 @@
 
+PROGNAME="modbus-demo"
 all:
 	go build
 
 release: all git-tag
-	tar jcf modbus-demo-`cat VERSION`.tar.bz2 modbustcp modbustcpd LICENSE README.md
+	mkdir ${PROGNAME}-`cat VERSION`
+	cp modbustcp modbustcpd LICENSE README.md ${PROGNAME}-`cat VERSION`
+	tar jcf ${PROGNAME}-`cat VERSION`.tar.bz2 ${PROGNAME}-`cat VERSION`
+	rm -rf ${PROGNAME}-`cat VERSION`
 
 git-tag: bump
 	git tag `cat VERSION`
@@ -15,4 +19,5 @@ bump:
 	mv VERSION.new VERSION
 
 upload:
-	scp modbus-demo-`cat VERSION`.tar.bz2 oplerno:/var/lib/lxd/containers/ateps-updates/rootfs/var/www/portage/distfiles/
+	scp ${PROGNAME}-`cat VERSION`.tar.bz2 oplerno:/var/lib/lxd/containers/ateps-updates/rootfs/var/www/portage/distfiles/
+
diff --git a/VERSION b/VERSION
index c239c60..810ee4e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5
+1.6