diff --git a/Gemfile b/Gemfile
index 70fc910..4fcab8e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "mochilo", :git => "https://github.com/spraints/mochilo", :ref => "symbols-and-regexps-and-time-oh-my"
+gem "mochilo", :git => "https://github.com/brianmario/mochilo", :ref => "master"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c485c2..79eb4b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,15 @@
 GIT
-  remote: https://github.com/spraints/mochilo
-  revision: 73fcaa99f01c42ad6017b201b0aeeca5f25a7a53
-  ref: symbols-and-regexps-and-time-oh-my
+  remote: https://github.com/brianmario/mochilo
+  revision: 8c75eea34bdde298733432b988c8d7f07f56e311
+  ref: master
   specs:
-    mochilo (2.0)
+    mochilo (2.1)
 
 PATH
   remote: .
   specs:
     bert (1.1.10)
-      mochilo
+      mochilo (>= 1.3, != 2.0)
 
 GEM
   remote: https://rubygems.org/
diff --git a/bert.gemspec b/bert.gemspec
index 0b694b0..fb1e181 100644
--- a/bert.gemspec
+++ b/bert.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
     s.extensions = ["ext/bert/c/extconf.rb"]
 
-    s.add_dependency "mochilo"
+    s.add_dependency "mochilo", ">= 1.3", "!= 2.0"
 
     s.add_development_dependency "thoughtbot-shoulda"
     s.add_development_dependency "git"
diff --git a/gemfiles/mochilo-v2 b/gemfiles/mochilo-v2
index 70fc910..4fcab8e 100644
--- a/gemfiles/mochilo-v2
+++ b/gemfiles/mochilo-v2
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "mochilo", :git => "https://github.com/spraints/mochilo", :ref => "symbols-and-regexps-and-time-oh-my"
+gem "mochilo", :git => "https://github.com/brianmario/mochilo", :ref => "master"