diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 141bd7a9ed80..2baa88184c4d 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -1,74 +1,79 @@
 # Created by: Alexander Novitsky <alecn2002@yandex.ru>
 
 PORTNAME=	gems
 PORTVERSION=	3.3.7
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	https://rubygems.org/rubygems/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	rubygems-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Package management framework for the Ruby language
 
 LICENSE=	MIT RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/MIT.txt
 LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe tar:tgz
 USE_RUBY=	yes
 
 GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
 GEMS_ENV=	GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
 NO_ARCH=	yes
 NO_BUILD=	yes
 RUBY_SETUP=	setup.rb
 RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR} \
-	--no-regenerate-binstubs \
-	--no-regenerate-plugins \
-	--format-executable
+			--no-format-executable \
+			--no-regenerate-binstubs \
+			--no-regenerate-plugins
 
 CACHE_DIR=	${GEMS_BASE_DIR}/cache
 DOC_DIR=	${GEMS_BASE_DIR}/doc
 EXT_DIR=	${GEMS_BASE_DIR}/extensions
 GEMS_DIR=	${GEMS_BASE_DIR}/gems
+PLUGINS_DIR=	${GEMS_BASE_DIR}/plugins
 SPEC_DIR=	${GEMS_BASE_DIR}/specifications
 
 PLIST_SUB=	CACHE_DIR="${CACHE_DIR}" \
 		DOC_DIR="${DOC_DIR}" \
 		EXT_DIR="${EXT_DIR}" \
 		GEMS_DIR="${GEMS_DIR}" \
+		PLUGINS_DIR="${PLUGINS_DIR}" \
 		SPEC_DIR="${SPEC_DIR}"
 
 CPE_VENDOR=	rubygems
 CPE_PRODUCT=	rubygems
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_VARS_OFF=	RUBY_SETUP_OPTIONS+="--no-ri --no-rdoc"
 
 post-extract:
-	${RM} -r ${WRKSRC}/bundler
-	${RM} -r ${WRKSRC}/lib/rubygems/ssl_certs
-	${FIND} ${WRKSRC} -name .document -delete
+	@${RM} -r ${WRKSRC}/bundler
+	@${RM} -r ${WRKSRC}/lib/rubygems/ssl_certs
+	@${FIND} ${WRKSRC} -name .document -delete
+
+post-patch:
+	@${RM} ${WRKSRC}/lib/rubygems/commands/setup_command.rb.orig
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info
-	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/plugins
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CACHE_DIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGINS_DIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SPEC_DIR}
 	cd ${WRKSRC}/ && ${SETENV} ${GEMS_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
-	${LN} -sf gem${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/gem
 
 # Find all RDOC and RI files
 post-install-DOCS-on:
 	cd ${STAGEDIR}${PREFIX}/ && ${FIND} -ds ${DOC_DIR}/ ! -type d >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-gems/files/patch-bundler-remove.patch b/devel/ruby-gems/files/patch-remove-bundler
similarity index 100%
rename from devel/ruby-gems/files/patch-bundler-remove.patch
rename to devel/ruby-gems/files/patch-remove-bundler
diff --git a/devel/ruby-gems/pkg-plist b/devel/ruby-gems/pkg-plist
index f63ddbdbc651..490ef682d2d1 100644
--- a/devel/ruby-gems/pkg-plist
+++ b/devel/ruby-gems/pkg-plist
@@ -1,206 +1,205 @@
 bin/gem
-bin/gem%%RUBY_SUFFIX%%
 %%RUBY_SITELIBDIR%%/rubygems.rb
 %%RUBY_SITELIBDIR%%/rubygems/available_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/basic_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/bundler_version_finder.rb
 %%RUBY_SITELIBDIR%%/rubygems/command.rb
 %%RUBY_SITELIBDIR%%/rubygems/command_manager.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/build_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/cert_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/check_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/cleanup_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/contents_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/dependency_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/environment_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/fetch_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/generate_index_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/help_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/info_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/install_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/list_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/lock_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/mirror_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/open_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/outdated_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/owner_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/pristine_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/push_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/query_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/rdoc_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/search_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/server_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/setup_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/signin_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/signout_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/sources_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/specification_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/stale_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/uninstall_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/unpack_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/update_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/which_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/yank_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/compatibility.rb
 %%RUBY_SITELIBDIR%%/rubygems/config_file.rb
 %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_gem.rb
 %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_require.rb
 %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_warn.rb
 %%RUBY_SITELIBDIR%%/rubygems/core_ext/tcpsocket_init.rb
 %%RUBY_SITELIBDIR%%/rubygems/defaults.rb
 %%RUBY_SITELIBDIR%%/rubygems/dependency.rb
 %%RUBY_SITELIBDIR%%/rubygems/dependency_installer.rb
 %%RUBY_SITELIBDIR%%/rubygems/dependency_list.rb
 %%RUBY_SITELIBDIR%%/rubygems/deprecate.rb
 %%RUBY_SITELIBDIR%%/rubygems/doctor.rb
 %%RUBY_SITELIBDIR%%/rubygems/errors.rb
 %%RUBY_SITELIBDIR%%/rubygems/exceptions.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/build_error.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/cmake_builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/configure_builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/ext_conf_builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/rake_builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/gem_runner.rb
 %%RUBY_SITELIBDIR%%/rubygems/gemcutter_utilities.rb
 %%RUBY_SITELIBDIR%%/rubygems/indexer.rb
 %%RUBY_SITELIBDIR%%/rubygems/install_default_message.rb
 %%RUBY_SITELIBDIR%%/rubygems/install_message.rb
 %%RUBY_SITELIBDIR%%/rubygems/install_update_options.rb
 %%RUBY_SITELIBDIR%%/rubygems/installer.rb
 %%RUBY_SITELIBDIR%%/rubygems/installer_uninstaller_utils.rb
 %%RUBY_SITELIBDIR%%/rubygems/local_remote_options.rb
 %%RUBY_SITELIBDIR%%/rubygems/mock_gem_ui.rb
 %%RUBY_SITELIBDIR%%/rubygems/name_tuple.rb
 %%RUBY_SITELIBDIR%%/rubygems/openssl.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/COPYING
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optionparser.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/ac.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/date.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/kwargs.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/shellwords.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/time.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/uri.rb
 %%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/version.rb
 %%RUBY_SITELIBDIR%%/rubygems/package.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/digest_io.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/file_source.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/io_source.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/old.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/source.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_header.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_reader.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_reader/entry.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_writer.rb
 %%RUBY_SITELIBDIR%%/rubygems/package_task.rb
 %%RUBY_SITELIBDIR%%/rubygems/path_support.rb
 %%RUBY_SITELIBDIR%%/rubygems/platform.rb
 %%RUBY_SITELIBDIR%%/rubygems/psych_additions.rb
 %%RUBY_SITELIBDIR%%/rubygems/psych_tree.rb
 %%RUBY_SITELIBDIR%%/rubygems/query_utils.rb
 %%RUBY_SITELIBDIR%%/rubygems/rdoc.rb
 %%RUBY_SITELIBDIR%%/rubygems/remote_fetcher.rb
 %%RUBY_SITELIBDIR%%/rubygems/request.rb
 %%RUBY_SITELIBDIR%%/rubygems/request/connection_pools.rb
 %%RUBY_SITELIBDIR%%/rubygems/request/http_pool.rb
 %%RUBY_SITELIBDIR%%/rubygems/request/https_pool.rb
 %%RUBY_SITELIBDIR%%/rubygems/request_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/request_set/gem_dependency_api.rb
 %%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile.rb
 %%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile/parser.rb
 %%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile/tokenizer.rb
 %%RUBY_SITELIBDIR%%/rubygems/requirement.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/activation_request.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/api_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/api_set/gem_parser.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/api_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/best_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/composed_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/conflict.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/current_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/dependency_request.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/git_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/git_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/index_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/index_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/installed_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/installer_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/local_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/LICENSE
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/errors.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/resolver.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/state.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/requirement_list.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/source_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/spec_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/stats.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/vendor_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/vendor_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/s3_uri_signer.rb
 %%RUBY_SITELIBDIR%%/rubygems/safe_yaml.rb
 %%RUBY_SITELIBDIR%%/rubygems/security.rb
 %%RUBY_SITELIBDIR%%/rubygems/security/policies.rb
 %%RUBY_SITELIBDIR%%/rubygems/security/policy.rb
 %%RUBY_SITELIBDIR%%/rubygems/security/signer.rb
 %%RUBY_SITELIBDIR%%/rubygems/security/trust_dir.rb
 %%RUBY_SITELIBDIR%%/rubygems/security_option.rb
 %%RUBY_SITELIBDIR%%/rubygems/source.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/git.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/installed.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/local.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/lock.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/specific_file.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/vendor.rb
 %%RUBY_SITELIBDIR%%/rubygems/source_list.rb
 %%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb
 %%RUBY_SITELIBDIR%%/rubygems/specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/specification_policy.rb
 %%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/text.rb
 %%RUBY_SITELIBDIR%%/rubygems/tsort.rb
 %%RUBY_SITELIBDIR%%/rubygems/tsort/LICENSE.txt
 %%RUBY_SITELIBDIR%%/rubygems/tsort/lib/tsort.rb
 %%RUBY_SITELIBDIR%%/rubygems/uninstaller.rb
 %%RUBY_SITELIBDIR%%/rubygems/unknown_command_spell_checker.rb
 %%RUBY_SITELIBDIR%%/rubygems/uri.rb
 %%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb
 %%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
 %%RUBY_SITELIBDIR%%/rubygems/util.rb
 %%RUBY_SITELIBDIR%%/rubygems/util/licenses.rb
 %%RUBY_SITELIBDIR%%/rubygems/util/list.rb
 %%RUBY_SITELIBDIR%%/rubygems/validator.rb
 %%RUBY_SITELIBDIR%%/rubygems/version.rb
 %%RUBY_SITELIBDIR%%/rubygems/version_option.rb
 @dir lib/ruby/gems/%%RUBY_VER%%/build_info
-@dir lib/ruby/gems/%%RUBY_VER%%/plugins
 @dir %%CACHE_DIR%%
 @dir %%DOC_DIR%%
 @dir %%EXT_DIR%%
 @dir %%GEMS_DIR%%
+@dir %%PLUGINS_DIR%%
 @dir %%SPEC_DIR%%