diff --git a/MOVED b/MOVED
index dbac1ce0a179..8f642fbf1992 100644
--- a/MOVED
+++ b/MOVED
@@ -9166,3 +9166,4 @@ net-p2p/gnunet-gtk||2017-03-27|Has expired: Depends on expiring net-p2p/gnunet
 net-p2p/gnunet||2017-03-27|Has expired: Broken for more than 6 months
 print/abc2mtex||2017-03-27|Has expired: Depends on expiring print/musixtex
 ftp/bareftp||2017-03-27|Has expired: Broken for more than 6 months
+www/rubygem-jquery-rails4|www/rubygem-jquery-rails|2017-03-27|Remove PKGNAMESUFFIX
diff --git a/textproc/rubygem-rich/Makefile b/textproc/rubygem-rich/Makefile
index fab40466a256..2a60dfcd2fd1 100644
--- a/textproc/rubygem-rich/Makefile
+++ b/textproc/rubygem-rich/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rich
 PORTVERSION=	1.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -13,7 +13,7 @@ COMMENT=	Opinionated WYSIWYG editor for Rails based on CKEditor
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-jquery-rails4>=4.0:www/rubygem-jquery-rails4 \
+RUN_DEPENDS=	rubygem-jquery-rails>=4.0:www/rubygem-jquery-rails \
 		rubygem-kaminari>=0:www/rubygem-kaminari \
 		rubygem-mime-types>=0:misc/rubygem-mime-types \
 		rubygem-paperclip>=0:devel/rubygem-paperclip \
diff --git a/www/Makefile b/www/Makefile
index 54c8e6b09f61..d532c5a66ba9 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1998,7 +1998,7 @@
     SUBDIR += rubygem-journey
     SUBDIR += rubygem-jquery-atwho-rails
     SUBDIR += rubygem-jquery-atwho-rails-rails4
-    SUBDIR += rubygem-jquery-rails4
+    SUBDIR += rubygem-jquery-rails
     SUBDIR += rubygem-jquery-scrollto-rails
     SUBDIR += rubygem-jquery-turbolinks
     SUBDIR += rubygem-jquery-ui-rails-rails4
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 9d176e6e1bba..9daba46bb4d6 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	8.15.8
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org
@@ -140,7 +141,7 @@ RUN_DEPENDS=	git>=2.8.4:devel/git \
 	rubygem-gemojione>=3:graphics/rubygem-gemojione \
 	rubygem-gon>=6.1.0:www/rubygem-gon \
 	rubygem-jquery-atwho-rails>=1.3.2:www/rubygem-jquery-atwho-rails \
-	rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \
+	rubygem-jquery-rails>=4.1.0:www/rubygem-jquery-rails \
 	rubygem-jquery-ui-rails5-rails4>=5.0.0:www/rubygem-jquery-ui-rails5-rails4 \
 	rubygem-request_store>=1.3:devel/rubygem-request_store \
 	rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \
diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index e6b09a15c53e..bce57f380e37 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	redmine
 PORTVERSION=	3.2.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://www.redmine.org/releases/
 
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-rails4>=4.2.5:www/rubygem-rails4 \
-		rubygem-jquery-rails4>=3.1.4:www/rubygem-jquery-rails4 \
+		rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \
 		rubygem-coderay>=1.1.0:textproc/rubygem-coderay \
 		rubygem-builder>=3.0.4:devel/rubygem-builder \
 		rubygem-request_store>=1.0.5:devel/rubygem-request_store \
diff --git a/www/rubygem-jquery-rails4/Makefile b/www/rubygem-jquery-rails/Makefile
similarity index 96%
rename from www/rubygem-jquery-rails4/Makefile
rename to www/rubygem-jquery-rails/Makefile
index dd5c16c55c7d..1c70017fd638 100644
--- a/www/rubygem-jquery-rails4/Makefile
+++ b/www/rubygem-jquery-rails/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	jquery-rails
 PORTVERSION=	4.3.1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
-PKGNAMESUFFIX=	4
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Provides a Rails generator for jQuery
diff --git a/www/rubygem-jquery-rails4/distinfo b/www/rubygem-jquery-rails/distinfo
similarity index 100%
rename from www/rubygem-jquery-rails4/distinfo
rename to www/rubygem-jquery-rails/distinfo
diff --git a/www/rubygem-jquery-rails4/pkg-descr b/www/rubygem-jquery-rails/pkg-descr
similarity index 100%
rename from www/rubygem-jquery-rails4/pkg-descr
rename to www/rubygem-jquery-rails/pkg-descr
diff --git a/www/rubygem-rails4/Makefile b/www/rubygem-rails4/Makefile
index 91ffccfe31f8..09c9d166bbf0 100644
--- a/www/rubygem-rails4/Makefile
+++ b/www/rubygem-rails4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rails
 PORTVERSION=	4.2.8
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	4
@@ -26,7 +27,7 @@ RUN_DEPENDS=	rubygem-actionmailer4>=${PORTVERSION}:mail/rubygem-actionmailer4 \
 		rubygem-coffee-rails41>=4.1.1:devel/rubygem-coffee-rails41 \
 		rubygem-execjs>=2.2.1:devel/rubygem-execjs \
 		rubygem-jbuilder>=2.1.3:devel/rubygem-jbuilder \
-		rubygem-jquery-rails4>=4.0:www/rubygem-jquery-rails4 \
+		rubygem-jquery-rails>=4.0:www/rubygem-jquery-rails \
 		rubygem-railties4>=${PORTVERSION}:www/rubygem-railties4 \
 		rubygem-rake>=10.3:devel/rubygem-rake \
 		rubygem-rdoc>=4.0.2:devel/rubygem-rdoc \