diff --git a/.travis.yml b/.travis.yml
index 1de699d78..72579701d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,13 +27,31 @@ cache:
   directories:
     - build/src
 
-addons:
-  artifacts:
-    paths:
-    - $( ls build/deepstream-* )
-    target_paths:
-    - $TRAVIS_REPO_SLUG
+deploy:
+  - provider: s3
+    access_key_id:
+      secure: "Tl42ZPo3T6LpJ24QBfs8ZAOlYZr/8NgfOPhbsWf0In6ro4cEgOaq3JFSooP/eozSquYs1scpgpSv48a7dvHv4Ranm/toO9sxPgMs95OnjJCMSY2//oM+rStRAJTMLoeB2OWWgs1oSGkiuFJASXalTueVGOlVMFDsQ8MEHOWIv32vXFG6P3SgtO5GiTAvtYZEVnTdUSgZEni5dyWMRwP6ugMsl1WEBIBTE8xNHnRIPBD/sQk7pgWYp/Q4FQZ5NMcG7oegF4DLsxvUP5XVQIFABD/8G19Y/ABN9yCsvmXlywTZ2xROQts6Qpwq0w+qXMYHawJA2TeHRG0InfEJRXvKC62XD0fzpzJxASDsZa5oEfTtl2FY4MvQsWZnvgGLLs/nWkPPJNOphxVjX0x3xPPUydsNGYGty5f2tTjWx2axF+gOYY3yAFAXCLCx6JM6cKY7QlEUvG/v+okB9foJSnTl+POS16giCiBTNmi1qo0J3kvdb6zSa4JkvO5ZNq5VCmLRN+G0xh1IYuZaTwaQQz9bntdRm+IOBjGCExR5qhT5gClYhM8DHrQXl0d/aFfvtvw89ljLvPQ+rZGeSjqM03q3u1KqLhheF0px7cSPQ1PmSPtY4aO4JIR3Aw/6Szo5a4crXyze6qzkbboUaVZQTXJauuna35AkTTFnqwkHOuAys3g="
+    secret_access_key:
+      secure: "eEtp6gpC9d/abC/RRaBjcIKylNz2E52xLXAvshDJ03RrBg5IkXFlaP/JalCqXnh755QpHRpyUsAT1D3I9bsELCUaNZyldmLr/TeYQUQhYkDqww/HPJk8i3a6tkFP8NgdrM+2XNF2CQMPxnPoPRg99gKv/YpISaWvsMvgvFlj7tXuhL8iKIe0LDlQTSg5ICfo4a2HEfH8/6wGMBf+uWkpJ8v3h2IxjI2JcjpW2Zg+wc8LekZc1jHLp2DAj0G+pZ499LedpqF5wjgqMIMseF+DWRkUTD5GPlWtbn/nfBodSW4TeWPIyp+QgPX7zMbmt7CCtIZBkfqzCEVFGTkYkfYler9tC9RHDdzIr8tjNP25j9c9IQ4lh+i03xGEfYEg0PIXVxtg5yDm7SZY7Kx8weBnkuNMMss1VcTXTSAuIOmUC4+8BBjhl0UWjtIElAsvUD6NLbgHS9N5eHGVHrpck9WJXjZykJF/+g3ONQyeI9T46OaJ+K5zmGBLnx3a4xNa4oZB11UzgXXuzsUFFratzzyhUm5V0nh4uADXiQVoWTPKT9I9cI7q8ZHL4C0Zocb8faSgdWpqbfk6zX/K/wcaleqgmz3y/RUV0JBZvYx4ckJr4wWT+U3Opy6nIkWA0zyTeJwjpYEFCngmfopAvG/byt+9XCm1WOsDrE1H/fbfK52r1qQ="
+    bucket: ds-server-artifacts
+    skip_cleanup: true
+    acl: public_read
+    local_dir: $( ls build | grep -v src )
+    upload-dir: $TRAVIS_REPO_SLUG
+  - provider: releases
+    skip_cleanup: true
+    api_key:
+      secure: "PY1AfzPa1uO7n+IE/u5eM+vuQEWm46oPK6ygqIU1KEQO2sjayb+KsWmWGfgngxDM/gUcu0XRDGB3G9QTK3Lsj6zPq582Pi3xlm3WdRQj/23SigAxO1IxIddrdyTGP21Ifkpul/A7nYLhBfpDVS1vP1qzPZmQy61GG2il0pTnsDCy2eDu/WccWFeBns4XDDIxOJJH43dQBcYL7IXZ93d77VraGGyHQmHdVJMSYVUhPHvkzJCitrbKZ30KxD8ewTURYzWfzrjOSr1kW2L0/FYDHFHImOVjeGvCXsQ5GjwGoTIHXUn6Buz7dwQUUU7IB/a+2cObliHx8JVHSJNtiiJJL2FqLjDW6SajP5umuEyXlJzETTpJgiwPj7YIU5oVWCr80SSEBeZugQL/JBb/n78SdmHo7kxLCq5WmwLi5hBGIX4OQ5gcoY+GARguprzYrS7n1Nh2RGAYmlmMUzKqSTGRlfl/V/7aDxsIkzrKShIa4OqHjDxWvWaRsykAc6aGg2E6Dy2iagFRfohAf0V4qIRfgIvzLz16Add3B61m0jDV5OjT45Or8h5+Ihj7FqjA4uGeQIA5/kIL5LFzFiwTR6wRRJl2gmMQsNP30FFJb9gtRmGkQfMBB7vIwJD+ye4arR4jFK4ciFSPjEvk63dkaSp5T/2Lh/0Pj0L3m2Z1ofmx9NU="
+    file_glob: true
+    file:
+      - "build/*.deb"
+      - "build/*.rpm"
+      - "build/*.tar.gz"
+      - "build/*.zip"
+    on:
+      tags: true
 
+addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
diff --git a/appveyor.yml b/appveyor.yml
index 8e944eb8c..410610b84 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ test_script:
   - node --version
   - npm --version
   - npm test
-  - npm run package
+  - npm run package && bash scripts\package.sh
 
 deploy:
   provider: S3
diff --git a/package.json b/package.json
index 687baca93..91f6fef0a 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "reporter": "node jasmine-runner",
     "test": "jasmine JASMINE_CONFIG_PATH=jasmine.json",
     "test-http-server": "node test/test-helper/start-test-server.js",
-    "package": "node scripts/package.js"
+    "package": "node scripts/package.js && scripts/package.sh"
   },
   "repository": {
     "type": "git",
diff --git a/scripts/details.js b/scripts/details.js
new file mode 100644
index 000000000..141e6ba64
--- /dev/null
+++ b/scripts/details.js
@@ -0,0 +1,13 @@
+var exec = require( 'child_process' ).execSync;
+
+if( process.argv[2] === 'VERSION' ) {
+	console.log( require('../package').version )
+} else if( process.argv[2] === 'NAME' ) {
+	console.log( require('../package').name )
+} else if( process.argv[2] === 'OS' ) {
+	console.log( require('os').platform() )
+} else if( process.argv[2] === 'COMMIT' ) {
+	console.log( exec( 'git log --pretty=format:%h -n 1' ).toString() )
+}	else {
+	console.log( 'ERROR: Pass in VERSION or NAME as env variable' )
+}
\ No newline at end of file
diff --git a/scripts/package.js b/scripts/package.js
index c737a8d63..af666ae38 100644
--- a/scripts/package.js
+++ b/scripts/package.js
@@ -4,6 +4,7 @@ var os = require( 'os' );
 var nodeVersion = '4.4.4';
 var commit = process.env.TRAVIS_COMMIT || process.env.APPVEYOR_REPO_COMMIT || 'local';
 var platform = os.platform();
+var extension = platform == 'win32' ? '.exe' : '';
 var packageVersion = require( '../package.json' ).version;
 
 if( process.version.indexOf( nodeVersion ) === -1 ) {
@@ -13,7 +14,7 @@ if( process.version.indexOf( nodeVersion ) === -1 ) {
 
 // Only include first seven for it to be unique
 commit = commit.substr( 0, 7 );
-var fileName = `build/deepstream-${packageVersion}--${commit}-${platform}.nexe`;
+var fileName = `build/deepstream.io${extension}`;
 
 console.log( `Compiling: ${fileName}` );
 
diff --git a/scripts/package.sh b/scripts/package.sh
new file mode 100644
index 000000000..a9214f3e3
--- /dev/null
+++ b/scripts/package.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+PACKAGED_NODE_VERSION="v4.4.4"
+NODE_VERSION=$( node --version )
+COMMIT=$( node scripts/details.js COMMIT )
+PACKAGE_VERSION=$( node scripts/details.js VERSION )
+PACKAGE_NAME=$( node scripts/details.js NAME )
+OS=$( node scripts/details.js OS )
+DEEPSTREAM_PACKAGE=build/$PACKAGE_VERSION/deepstream.io
+
+rm -rf build/$PACKAGE_VERSION
+
+mkdir build/$PACKAGE_VERSION
+mkdir $DEEPSTREAM_PACKAGE
+mkdir $DEEPSTREAM_PACKAGE/conf
+mkdir $DEEPSTREAM_PACKAGE/var
+mkdir $DEEPSTREAM_PACKAGE/lib
+
+cp users.json $DEEPSTREAM_PACKAGE/conf/users.json
+cp permissions.json $DEEPSTREAM_PACKAGE/conf/permissions.json
+cp config.yml $DEEPSTREAM_PACKAGE/conf/config.yml
+cp build/deepstream $DEEPSTREAM_PACKAGE/
+
+echo 'Done'
\ No newline at end of file