diff --git a/server.js b/server.js
index 5462d42b83..4a47ca7429 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
-  port = process.env.PORT || 3000;
+var port = process.env.PORT || 3000;
+if (process.env.NODE_ENV === 'debug' || process.env.NODE_ENV === 'production') {
+  // "up" module interferes with node debug & node-inspector. also, nodejitsu (aka, 'production') doesn't like up
+  console.log('Running in ' + process.env.NODE_ENV + ': require("./lib/server").listen(' + port + ');');
   require('./lib/server').listen(port);
 } else {
-  require('derby').run(__dirname + '/lib/server');
+  require('derby').run(__dirname + '/lib/server', port);
 }
\ No newline at end of file