diff --git a/middleman-core/lib/middleman-core/step_definitions.rb b/middleman-core/lib/middleman-core/step_definitions.rb
index b4024ca4..c5c7a8db 100644
--- a/middleman-core/lib/middleman-core/step_definitions.rb
+++ b/middleman-core/lib/middleman-core/step_definitions.rb
@@ -8,5 +8,5 @@ require 'middleman-core/step_definitions/builder_steps'
 require 'middleman-core/step_definitions/server_steps'
 
 Before do
-  @aruba_timeout_seconds = 30
+  @aruba_timeout_seconds = 60
 end
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 78cbf165..6aa1d9cd 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.version     = Middleman::VERSION
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"
-  s.authors     = ["Thomas Reynolds", "Ben Hollis"]
-  s.email       = ["me@tdreyno.com", "ben@benhollis.net"]
+  s.authors     = ["Thomas Reynolds", "Ben Hollis", "Karl Freeman"]
+  s.email       = ["me@tdreyno.com", "ben@benhollis.net", "karlfreeman@gmail.com"]
   s.homepage    = "http://middlemanapp.com"
   s.summary     = "Hand-crafted frontend development"
   s.description = "A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle."
@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
 
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
-  s.add_dependency("rack", [">= 1.4.5"])
-  s.add_dependency("tilt", ["~> 1.4.1"])
+  s.add_dependency("rack", [">= 1.4.5", "< 2.0"])
+  s.add_dependency("tilt", ["~> 1.4.1", "< 2.0"])
   s.add_dependency("erubis")
   s.add_dependency("hooks", ["~> 0.3"])
 
   # Builder
-  s.add_dependency("rack-test", ["~> 0.6.1"])
+  s.add_dependency("rack-test", ["~> 0.6.2"])
 
   # CLI
   s.add_dependency("thor", [">= 0.15.2", "< 2.0"])
diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec
index 775c6c14..3ff71f9c 100644
--- a/middleman/middleman.gemspec
+++ b/middleman/middleman.gemspec
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency("compass", [">= 0.12.4"])
   s.add_dependency("uglifier", ["~> 2.5"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
-  s.add_dependency("execjs", ["~> 1.4.0"])
+  s.add_dependency("execjs", ["~> 2.0"])
   s.add_dependency("kramdown", ["~> 1.2"])
 end