diff --git a/bin/setup b/bin/setup
index 976ae4365c..bff486cc34 100755
--- a/bin/setup
+++ b/bin/setup
@@ -14,7 +14,7 @@ FileUtils.chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
-  system! "gem install bundler --conservative"
+  system! "script/install-bundler"
   system("bundle check") || system!("bundle install")
 
   # Install JavaScript dependencies
diff --git a/script/setup b/script/setup
index d0c84566dc..d8f03ae63b 100755
--- a/script/setup
+++ b/script/setup
@@ -27,9 +27,6 @@ elif ! ruby --version | grep $RUBY_VERSION > /dev/null; then
   exit 1
 fi
 
-# Install used Bundler version
-./script/install-bundler
-
 # Install dependencies, prepare database and tidy
 ./bin/setup