diff --git a/libs/app.js b/libs/app.js
index eebf0d6aad218a75db1e03e34b02a131ff2d165b..3fce3744a734395850a3fb02304c1c8a8881f5bc 100644
--- a/libs/app.js
+++ b/libs/app.js
@@ -27,10 +27,10 @@ app.use(cors())
 app.use(methodOverride())
 app.use(apicache('1 hour'))
 
-app.use('/v1/', api)
-app.use('/v1/states', states)
-app.use('/v1/regions', regions)
-app.use('/v1/cities', cities)
+app.use('/api/v1/', api)
+app.use('/api/v1/states', states)
+app.use('/api/v1/regions', regions)
+app.use('/api/v1/cities', cities)
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next){
diff --git a/server.js b/server.js
index dc0c1ce36563fd3fb4d967480e54548b7c9fff4c..f27cd5c80693c1b31bbd500a5fcbae00a86b957d 100644
--- a/server.js
+++ b/server.js
@@ -5,9 +5,9 @@ var config = require(libs + 'config')
 var log = require(libs + 'log')(module)
 var app = require(libs + 'app')
 
-app.set('port', config.get('port') || 3000)
+app.set('port', process.env.PORT || config.get('port') || 3000)
 
 var server = app.listen(app.get('port'), function() {
   debug('Express server listening on port ' + server.address().port)
-  log.info('Express server listening on port ' + config.get('port'))
+  log.info('Express server listening on port ' + server.address().port)
 })