diff --git a/lib/middleman/base.rb b/lib/middleman/base.rb
index 5d994ce9..3ba60936 100644
--- a/lib/middleman/base.rb
+++ b/lib/middleman/base.rb
@@ -28,37 +28,37 @@ module Middleman::Base
       app.set :static, false
 
       app.set :views, "source"
-
+      
       # Add Builder Callbacks
       app.register Middleman::CoreExtensions::Builder
       
       # Add Rack::Builder.map to Sinatra
       app.register Middleman::CoreExtensions::RackMap
-
+      
       # Activate custom features
       app.register Middleman::CoreExtensions::Features
-
+      
       # Setup custom rendering
       app.register Middleman::CoreExtensions::Rendering
-
+      
       # Compass framework
       app.register Middleman::CoreExtensions::Compass
-
+      
       # Sprockets asset handling
       app.register Middleman::CoreExtensions::Sprockets
-
+      
       # Setup asset path pipeline
       app.register Middleman::CoreExtensions::Assets
-
+      
       # Activate built-in helpers
       app.register Middleman::CoreExtensions::DefaultHelpers
-
+      
       # Activate Yaml Data package
       app.register Middleman::CoreExtensions::Data
-
+      
       # with_layout and page routing
       app.register Middleman::CoreExtensions::Routing
-
+      
       # Parse YAML from templates
       app.register Middleman::CoreExtensions::FrontMatter
 
diff --git a/middleman.gemspec b/middleman.gemspec
index fe0dd99f..1f140a47 100644
--- a/middleman.gemspec
+++ b/middleman.gemspec
@@ -42,8 +42,8 @@ eos
   s.add_runtime_dependency("tilt", ["~> 1.3.1"])
   s.add_runtime_dependency("maruku", ["~> 0.6.0"])
   s.add_runtime_dependency("sinatra", ["~> 1.2.6"])
-  s.add_runtime_dependency("padrino-core", ["~> 0.10.1"])
-  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.1"])
+  s.add_runtime_dependency("padrino-core", ["~> 0.10.0", '< 0.10.1'])
+  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.0", '< 0.10.1'])
   s.add_runtime_dependency("rack-test", ["~> 0.6.1"])
   s.add_runtime_dependency("uglifier", ["~> 1.0.0"])
   s.add_runtime_dependency("slim", ["~> 0.9.0"])