diff --git a/Gemfile b/Gemfile
index 25069bd4..520c052b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,6 @@ gemspec
 
 # maintain compatibility against master
 gem 'haml', github: 'haml/haml'
-gem 'faml', github: 'eagletmt/faml', branch: 'optional-extend', submodules: true
 
 gem 'benchmark-ips', '2.3.0'
 gem 'lineprof'
diff --git a/hamlit.gemspec b/hamlit.gemspec
index 4c3322bf..72a6790d 100644
--- a/hamlit.gemspec
+++ b/hamlit.gemspec
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'coffee-script'
+  spec.add_development_dependency 'faml'
   spec.add_development_dependency 'less'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rails', '>= 4.0.0'