diff --git a/misc/ruby-bundler/ALTERNATIVES b/misc/ruby-bundler/ALTERNATIVES
index 77aa29e014ce..47137a934b1b 100644
--- a/misc/ruby-bundler/ALTERNATIVES
+++ b/misc/ruby-bundler/ALTERNATIVES
@@ -1,2 +1,2 @@
-bin/bundle @PREFIX@/bin/bundle@RUBY_SUFFIX@
-bin/bundler @PREFIX@/bin/bundler@RUBY_SUFFIX@
+bin/bundle @PREFIX@/bin/bundle2-@RUBY_SUFFIX@
+bin/bundler @PREFIX@/bin/bundler2-@RUBY_SUFFIX@
diff --git a/misc/ruby-bundler/Makefile b/misc/ruby-bundler/Makefile
index f5f3215d208d..a032f92a1496 100644
--- a/misc/ruby-bundler/Makefile
+++ b/misc/ruby-bundler/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2019/04/15 06:11:32 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/09/18 14:30:43 taca Exp $
 
-DISTNAME=	bundler-1.17.3
+DISTNAME=	bundler-2.0.2
 CATEGORIES=	misc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,12 +8,15 @@ HOMEPAGE=	https://bundler.io/
 COMMENT=	Manage your application's dependencies
 LICENSE=	mit
 
-#
-# Currently, ruby26-base has the same version of bundler.
-#
-RUBY_VERSIONS_ACCEPTED=	24 25
-
 RUBYGEM_OPTIONS+=	--format-executable
+COMMANDS=		bundle bundler
+
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && \
+	for f in ${COMMANDS}; do \
+		${TEST} -f $${f}2-${RUBY_SUFFIX} || \
+			${MV} $${f}${RUBY_SUFFIX} $${f}2-${RUBY_SUFFIX}; \
+	done
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ruby-bundler/PLIST b/misc/ruby-bundler/PLIST
index 36b6e607feea..c8cef8d3a032 100644
--- a/misc/ruby-bundler/PLIST
+++ b/misc/ruby-bundler/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.25 2018/12/17 15:00:41 taca Exp $
-bin/bundle${RUBY_SUFFIX}
-bin/bundler${RUBY_SUFFIX}
+@comment $NetBSD: PLIST,v 1.26 2019/09/18 14:30:43 taca Exp $
+bin/bundle2-${RUBY_SUFFIX}
+bin/bundler2-${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CHANGELOG.md
 ${GEM_LIBDIR}/LICENSE.md
@@ -161,6 +161,7 @@ ${GEM_LIBDIR}/lib/bundler/ui/shell.rb
 ${GEM_LIBDIR}/lib/bundler/ui/silent.rb
 ${GEM_LIBDIR}/lib/bundler/uri_credentials_filter.rb
 ${GEM_LIBDIR}/lib/bundler/vendor/fileutils/lib/fileutils.rb
+${GEM_LIBDIR}/lib/bundler/vendor/fileutils/lib/fileutils/version.rb
 ${GEM_LIBDIR}/lib/bundler/vendor/molinillo/lib/molinillo.rb
 ${GEM_LIBDIR}/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb
 ${GEM_LIBDIR}/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
diff --git a/misc/ruby-bundler/distinfo b/misc/ruby-bundler/distinfo
index f8a67eab3131..70201a2f83ca 100644
--- a/misc/ruby-bundler/distinfo
+++ b/misc/ruby-bundler/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.31 2019/01/20 14:15:00 taca Exp $
+$NetBSD: distinfo,v 1.32 2019/09/18 14:30:43 taca Exp $
 
-SHA1 (bundler-1.17.3.gem) = b5f0a9bffd4ff9b983b536704973fbe1cf49f015
-RMD160 (bundler-1.17.3.gem) = dc0597bea59ff9f7f1feeec140898363e3747cac
-SHA512 (bundler-1.17.3.gem) = 658de4228bc12fa5ca6ce335f76fff773f64da9f3d12f5097b4fd28d4c4f4d2a5bf12dce761b3d95432c5ea6a5aafae895df87c26660a4567db8b682aff48c02
-Size (bundler-1.17.3.gem) = 364032 bytes
+SHA1 (bundler-2.0.2.gem) = fe373c106bdb98fa9ef93e2a15e59c3fc081abbb
+RMD160 (bundler-2.0.2.gem) = cb8ce17de3862658560094f6f4df0b2fff765faf
+SHA512 (bundler-2.0.2.gem) = f41fe9e385fbf42859f3514b71abdaa1fd787f4ff4b1169b8ee40ea7778c114657c60ca3d6d6d72fbe972af0558f0cccd9c9f28cad7fc712ada27f037dce8a6a
+Size (bundler-2.0.2.gem) = 366592 bytes