diff --git a/devel/rubygem-grape-path-helpers/Makefile b/devel/rubygem-grape-path-helpers/Makefile
index 26c644e6c4ab..2353edc61a7f 100644
--- a/devel/rubygem-grape-path-helpers/Makefile
+++ b/devel/rubygem-grape-path-helpers/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	grape-path-helpers
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Route path helpers for Grape
 WWW=		https://gitlab.com/gitlab-org/grape-path-helpers
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activesupport70>=0:devel/rubygem-activesupport70 \
-		rubygem-grape>=2.0<3:devel/rubygem-grape \
+RUN_DEPENDS=	rubygem-activesupport-gitlab>=0:devel/rubygem-activesupport-gitlab \
+		rubygem-grape20>=2.0<3:devel/rubygem-grape20 \
 		rubygem-rake>=12:devel/rubygem-rake \
 		rubygem-ruby2_keywords>=0.0.2<0.1:devel/rubygem-ruby2_keywords
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-grape-swagger/Makefile b/devel/rubygem-grape-swagger/Makefile
index 9989d06f69ba..4cfe6aa3297b 100644
--- a/devel/rubygem-grape-swagger/Makefile
+++ b/devel/rubygem-grape-swagger/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	grape-swagger
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Documentation tool for grape APIs
 WWW=		https://github.com/ruby-grape/grape-swagger
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-grape>=1.7<3.0:devel/rubygem-grape \
+RUN_DEPENDS=	rubygem-grape20>=1.7<3.0:devel/rubygem-grape20 \
 		rubygem-rack-test>=2<3:www/rubygem-rack-test
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-grape20/Makefile b/devel/rubygem-grape20/Makefile
index ac608654a965..db5d709155ad 100644
--- a/devel/rubygem-grape20/Makefile
+++ b/devel/rubygem-grape20/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	grape
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	20
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Framework for rapid API development with great conventions
 WWW=		https://www.ruby-grape.org/ \
 		https://github.com/ruby-grape/grape
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport70>=5:devel/rubygem-activesupport70 \
+RUN_DEPENDS=	rubygem-activesupport-gitlab>=5:devel/rubygem-activesupport-gitlab \
 		rubygem-builder>=0:devel/rubygem-builder \
-		rubygem-dry-types>=1.1:devel/rubygem-dry-types \
+		rubygem-dry-types-gitlab>=1.1:devel/rubygem-dry-types-gitlab \
 		rubygem-mustermann-grape10>=1.0.0<1.1:devel/rubygem-mustermann-grape10 \
 		rubygem-rack>=1.3.0,3:www/rubygem-rack \
 		rubygem-rack-accept>=0:www/rubygem-rack-accept
 
 USES=		cpe gem
 
 CPE_VENDOR=	ruby-grape
 
 NO_ARCH=	yes
 
 PORTSCOUT=	limit:^2\.0\.
 
 .include <bsd.port.mk>