diff --git a/.gitignore b/.gitignore
index 722cca4f..d101c166 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@
 *.swo
 .ruby-version
 /doc
-.yardoc
 .bundle
diff --git a/.travis.yml b/.travis.yml
index fc6c1424..42f5994b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,3 @@ matrix:
     - rvm: jruby-9.2.7.0
 
   fast_finish: true
-
-# whitelist
-branches:
-  only:
-    - master
diff --git a/cucumber-core.gemspec b/cucumber-core.gemspec
index ee45a069..1ccdb544 100644
--- a/cucumber-core.gemspec
+++ b/cucumber-core.gemspec
@@ -26,15 +26,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'cucumber-tag_expressions', '~> 2.0', '>= 2.0.2'
   s.add_dependency 'backports', '~> 3.15', '>= 3.15.0'
 
-  s.add_development_dependency 'bundler', '>= 1.16.0'
-  s.add_development_dependency 'rake',      '>= 0.9.2'
-  s.add_development_dependency 'rspec',     '~> 3.6'
-  s.add_development_dependency 'unindent',  '>= 1.0'
-  s.add_development_dependency 'kramdown',  '~> 1.4.2'
-  s.add_development_dependency 'yard'
-
-  # For coverage reports
-  s.add_development_dependency 'coveralls', '~> 0.7'
+  s.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8.23'
+  s.add_development_dependency 'bundler', '~> 1.17', '>= 1.17.2'
+  s.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
+  s.add_development_dependency 'rspec', '~> 3.8', '>= 3.8.0'
+  s.add_development_dependency 'unindent', '~> 1.0', '>= 1.0'
 
   s.rubygems_version = ">= 1.6.1"
   s.test_files            = Dir[
diff --git a/scripts/update-gemspec b/scripts/update-gemspec
index 5e2d111f..8e613216 100755
--- a/scripts/update-gemspec
+++ b/scripts/update-gemspec
@@ -6,7 +6,7 @@ set -uf -o pipefail
 IFS=$'\n'
 
 gemspec=$(find . -type f -maxdepth 1 -name "*.gemspec")
-add_dependency_lines=$(cat ${gemspec} | grep "s.add_dependency '[^']*', '")
+add_dependency_lines=$(cat ${gemspec} | grep "s.add_[a-z_]*dependency '[^']*'")
 if [ $? -ne 0 ]; then
   # No add_dependency_lines found - nothing to do
   exit 0
@@ -16,9 +16,14 @@ set -e
 
 gems=$(echo "${add_dependency_lines}" | tr -s ' ' | cut -d ' ' -f3 | cut -d"'" -f 2)
 while read -r gem; do
-  gem_line=$(gem list "${gem}" --remote --all --no-prerelease | grep "^${gem}\s")
-  latest_patch_version=$(echo "${gem_line}" | cut -d'(' -f2 | cut -d',' -f1)
-  latest_minor_version=$(echo "${latest_patch_version}" | cut -d. -f1,2)
-  cat "${gemspec}" | sed "s/s.add_dependency '${gem}', .*/s.add_dependency '${gem}', '~> ${latest_minor_version}', '>= ${latest_patch_version}'/" > ${gemspec}.tmp
+  echo "upgrading ${gem}"
+  if [ "${gem}" = "bundler" ]; then
+    cat "${gemspec}" | sed "s/\(s.add_[a-z_]*dependency\) '${gem}'.*/\1 '${gem}', '~> 1.16', '>= 1.16.2'/" > ${gemspec}.tmp
+  else
+    gem_line=$(gem list "${gem}" --remote --all --no-prerelease | grep "^${gem}\s")
+    latest_patch_version=$(echo "${gem_line}" | cut -d'(' -f2 | cut -d',' -f1 | cut -d' ' -f1)
+    latest_minor_version=$(echo "${latest_patch_version}" | cut -d. -f1,2)
+    cat "${gemspec}" | sed "s/\(s.add_[a-z_]*dependency\) '${gem}'.*/\1 '${gem}', '~> ${latest_minor_version}', '>= ${latest_patch_version}'/" > ${gemspec}.tmp
+  fi
   mv ${gemspec}.tmp ${gemspec}
 done <<< "${gems}"