diff --git a/Gemfile b/Gemfile
index bc99eb19..ffd77ea2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,8 @@ source "https://rubygems.org"
 gem "compass"
 gem "bourbon"
 gem "neat"
-gem "bootstrap-sass"
-gem "font-awesome-sass"
+gem "bootstrap-sass", "~> 3.2"
+gem "font-awesome-sass", "~> 4.2"
 
 # compass fails with SASS than 3.3+
 # https://github.com/chriseppstein/compass/issues/1513
diff --git a/gemfiles/Gemfile.bootstrap-pre-3.2 b/gemfiles/Gemfile.bootstrap-pre-3.2
deleted file mode 100644
index df9397a1..00000000
--- a/gemfiles/Gemfile.bootstrap-pre-3.2
+++ /dev/null
@@ -1,2 +0,0 @@
-eval_gemfile "../Gemfile"
-gem "bootstrap-sass", "< 3.2"
diff --git a/gemfiles/Gemfile.fontawesome-pre-4.2 b/gemfiles/Gemfile.fontawesome-pre-4.2
deleted file mode 100644
index 3d126926..00000000
--- a/gemfiles/Gemfile.fontawesome-pre-4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-eval_gemfile "../Gemfile"
-gem "font-awesome-sass", "< 4.2"
diff --git a/gemfiles/Gemfile.jekyll-1.0 b/gemfiles/Gemfile.jekyll-1.0
deleted file mode 100644
index b45a4dfe..00000000
--- a/gemfiles/Gemfile.jekyll-1.0
+++ /dev/null
@@ -1,2 +0,0 @@
-eval_gemfile "../Gemfile"
-gem "jekyll", "~> 1.0"
diff --git a/jekyll-assets.gemspec b/jekyll-assets.gemspec
index 47bfc6ff..e76905ea 100644
--- a/jekyll-assets.gemspec
+++ b/jekyll-assets.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jekyll",    ">= 1.0.0", "< 3.0.0"
+  spec.add_dependency "jekyll",    "~> 2.0"
   spec.add_dependency "sprockets", "~> 2.10"
   spec.add_dependency "sprockets-sass"
   spec.add_dependency "sprockets-helpers"
diff --git a/lib/jekyll-assets/bootstrap.rb b/lib/jekyll-assets/bootstrap.rb
index 7e88debb..8c5749aa 100644
--- a/lib/jekyll-assets/bootstrap.rb
+++ b/lib/jekyll-assets/bootstrap.rb
@@ -1,8 +1,7 @@
 require "sprockets"
 
 gemspec = Gem::Specification.find_by_name "bootstrap-sass"
-subpath = Gem::Version.new("3.2") <= gemspec.version ? "" : "vendor"
 
 %w[images fonts javascripts stylesheets].each do |asset|
-  Sprockets.append_path File.join(gemspec.gem_dir, subpath, "assets", asset)
+  Sprockets.append_path File.join(gemspec.gem_dir, "assets", asset)
 end
diff --git a/lib/jekyll-assets/font-awesome.rb b/lib/jekyll-assets/font-awesome.rb
index cd981ea7..f58ddf5a 100644
--- a/lib/jekyll-assets/font-awesome.rb
+++ b/lib/jekyll-assets/font-awesome.rb
@@ -1,8 +1,7 @@
 require "sprockets"
 
 gemspec = Gem::Specification.find_by_name "font-awesome-sass"
-subpath = Gem::Version.new("4.2") <= gemspec.version ? "" : "vendor"
 
 %w[fonts stylesheets].each do |asset|
-  Sprockets.append_path File.join(gemspec.gem_dir, subpath, "assets", asset)
+  Sprockets.append_path File.join(gemspec.gem_dir, "assets", asset)
 end
diff --git a/spec/fixtures/_assets/vendor/with_bootstrap.css.sass b/spec/fixtures/_assets/vendor/with_bootstrap.css.sass
new file mode 100644
index 00000000..79ffd239
--- /dev/null
+++ b/spec/fixtures/_assets/vendor/with_bootstrap.css.sass
@@ -0,0 +1 @@
+@import "bootstrap"
diff --git a/spec/lib/jekyll-assets/bootstrap_spec.rb b/spec/lib/jekyll-assets/bootstrap_spec.rb
index e832370e..590e6ff6 100644
--- a/spec/lib/jekyll-assets/bootstrap_spec.rb
+++ b/spec/lib/jekyll-assets/bootstrap_spec.rb
@@ -3,6 +3,7 @@
 
 RSpec.describe "Bootstrap integration" do
   it "globally appends bootstrap paths into Sprockets environment" do
-    expect(@site.assets["bootstrap.css"].to_s).to match(/bootstrap\//)
+    expect(@site.assets["vendor/with_bootstrap.css"].to_s)
+      .to match(/bootstrap\//)
   end
 end