diff --git a/server.js b/server.js
index 8bdaed8273..5462d42b83 100644
--- a/server.js
+++ b/server.js
@@ -1,8 +1,8 @@
 if (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'debug') {
   // "up" module interferes with node debug & node-inspector
   // also, nodejitsu (aka, 'production') doesn't like up
-  console.log("Using require('./lib/server').listen(3000) without Up");
-  require('./lib/server').listen(3000);
+  port = process.env.PORT || 3000;
+  require('./lib/server').listen(port);
 } else {
   require('derby').run(__dirname + '/lib/server');
 }
\ No newline at end of file