diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffa10aa2..40689a46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.4.8 - 2017-12-01
+
+* When listenPort is not specified, use 48484 as default #529 [Pablo Carranza Velez]
+
 ## v6.4.7 - 2017-11-20
 
 * Sync.js: Fix command to build the source code without optimizations #527 [Pablo Carranza Velez]
diff --git a/package.json b/package.json
index a02994c6..ec456210 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "6.4.7",
+  "version": "6.4.8",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/src/config.coffee b/src/config.coffee
index f9d1bd53..d86f4ba1 100644
--- a/src/config.coffee
+++ b/src/config.coffee
@@ -7,7 +7,7 @@ apiEndpoint = checkString(process.env.API_ENDPOINT)
 module.exports =
 	apiEndpoint: apiEndpoint
 	apiTimeout: checkInt(process.env.API_TIMEOUT, positive: true) ? 15 * 60 * 1000
-	listenPort: checkInt(process.env.LISTEN_PORT, positive: true) ? 80
+	listenPort: checkInt(process.env.LISTEN_PORT, positive: true) ? 48484
 	gosuperAddress: "http://unix:#{process.env.GOSUPER_SOCKET}:"
 	deltaHost: checkString(process.env.DELTA_ENDPOINT) ? 'https://delta.resin.io'
 	registryEndpoint: checkString(process.env.REGISTRY_ENDPOINT) ? 'registry.resin.io'