diff --git a/server.js b/server.js
index 232757a..aaf1583 100644
--- a/server.js
+++ b/server.js
@@ -9,8 +9,8 @@ var DocumentHandler = require('./lib/document_handler');
 
 // Load the configuration and set some defaults
 var config = JSON.parse(fs.readFileSync('./config.js', 'utf8'));
-config.port = config.port || 7777;
-config.host = config.host || 'localhost';
+config.port = process.env.PORT || config.port || 7777;
+config.host = process.env.HOST || config.host || 'localhost';
 
 // Set up the logger
 if (config.logging) {