diff --git a/.gitignore b/.gitignore
index 88206e8..053a445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ npm-debug.log
 node_modules
 
 *.sqlite
+*.env
diff --git a/server.js b/server.js
index cda47f9..f1fb3ad 100644
--- a/server.js
+++ b/server.js
@@ -16,8 +16,9 @@ app.configure(function() {
   app.use(express.errorHandler({dumpExceptions: true, showStack: true}));
 });
 
-server.listen(config.get('port'), function() {
-  console.log( 'Express server listening on port %d in %s mode', config.get('port'), app.settings.env );
+var port = process.env.PORT || config.get('port');
+server.listen(port, function() {
+  console.log( 'Express server listening on port %d in %s mode', port, app.settings.env );
 });
 
 app.get('/tasks', function(req,res){