diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bdeca59..eef45feb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+main
+------
+
+* Accept terrapin `1.x` alongside `0.6`, which also lifts the `climate_control < 1.0` that pinning `0.6` imposed
+
 0.14.1
 ------
 
diff --git a/ember-cli-rails.gemspec b/ember-cli-rails.gemspec
index 56bc827d..45ccabc9 100644
--- a/ember-cli-rails.gemspec
+++ b/ember-cli-rails.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ember-cli-rails-assets", ">= 0.9.0", "< 1.0"
   spec.add_dependency "railties", ">= 4.2"
   spec.add_dependency "rack", ">= 2.1", "< 4.0"
-  spec.add_dependency "terrapin", "~> 0.6.0"
+  spec.add_dependency "terrapin", ">= 0.6.0", "< 2.0"
   spec.add_dependency "html_page", "~> 0.1.0"
 
   spec.add_development_dependency "generator_spec", "~> 0.9.0"