diff --git a/Gemfile b/Gemfile
index 96fc0dfc8..b1ecd1fd6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ end
 
 gem "eventmachine", "1.0.3"
 gem "thin"
-gem "sinatra", "1.3.2"
+gem "sinatra", "1.4.2"
 gem "em-websocket", "~> 0.3.6"
 gem "jsmin", "~> 1.0.1"
 gem "ansi"
diff --git a/beef b/beef
index c8d8db1fe..7ea4d70c8 100755
--- a/beef
+++ b/beef
@@ -75,6 +75,7 @@ case config.get("beef.database.driver")
     DataMapper.setup(:default,
                      :adapter => config.get("beef.database.driver"),
                      :host => config.get("beef.database.db_host"),
+                     :port => config.get("beef.database.db_port"),
                      :username => config.get("beef.database.db_user"),
                      :password => config.get("beef.database.db_passwd"),
                      :database => config.get("beef.database.db_name"),
diff --git a/config.yaml b/config.yaml
index 4e6440c09..7e1a7c3d1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -78,6 +78,7 @@ beef:
 
         # db connection information is only used for mysql/postgres
         db_host: "localhost"
+        db_port: 5432
         db_name: "beef"
         db_user: "beef"
         db_passwd: "beef123"