diff --git a/CHANGELOG b/CHANGELOG
index 025588ad..0fa72041 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+2.0.12
+====
+Sinatra 1.3.1 and Padrino 0.10.4
+
+2.0.11
+=====
+- Lock Padrino and Sinatra versions (for now)
+
 2.0.9
 =====
 - Added --glob option to build which only builds matching files
diff --git a/middleman-x86-mingw32.gemspec b/middleman-x86-mingw32.gemspec
index b2a87819..aba80095 100644
--- a/middleman-x86-mingw32.gemspec
+++ b/middleman-x86-mingw32.gemspec
@@ -42,7 +42,7 @@ eos
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("maruku", ["~> 0.6.0"])
-  s.add_dependency("sinatra", ["~> 1.3.0"])
+  s.add_dependency("sinatra", ["~> 1.3.1"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
   s.add_dependency("slim", ["~> 1.0.2"])
@@ -51,8 +51,8 @@ eos
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("sprockets", ["~> 2.0.0"])
-  s.add_dependency("padrino-core", ["~> 0.10.3"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.3"])
+  s.add_dependency("padrino-core", ["~> 0.10.4"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.4"])
   
   s.add_dependency("eventmachine", ["1.0.0.beta.3"])
   s.add_dependency("win32-process", ["~> 0.6.5"])
diff --git a/middleman.gemspec b/middleman.gemspec
index db77d487..8481a1b7 100644
--- a/middleman.gemspec
+++ b/middleman.gemspec
@@ -42,7 +42,7 @@ eos
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("maruku", ["~> 0.6.0"])
-  s.add_dependency("sinatra", ["~> 1.3.0"])
+  s.add_dependency("sinatra", ["~> 1.3.1"])
   # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
@@ -53,8 +53,8 @@ eos
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
   s.add_dependency("sprockets", ["~> 2.0.0"])
-  s.add_dependency("padrino-core", ["~> 0.10.3"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.3"])
+  s.add_dependency("padrino-core", ["~> 0.10.4"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.4"])
   
   s.add_dependency("guard", ["~> 0.6.2"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])