diff --git a/MOVED b/MOVED
index e44f607ac45d..435f36bfaeaa 100644
--- a/MOVED
+++ b/MOVED
@@ -16700,3 +16700,4 @@ www/rubygem-redis-rack1|www/rubygem-redis-rack|2021-12-21|Remove obsoleted port.
 x11-toolkits/rubygem-gtksourceview2|x11-toolkits/rubygem-gtksourceview3|2021-12-21|Remove obsoleted port. Use x11-toolkits/rubygem-gtksourceview3 instead
 x11-toolkits/rubygem-vte|x11-toolkits/rubygem-vte3|2021-12-21|Remove obsoleted port. Use x11-toolkits/rubygem-vte3 instead
 sysutils/asmon||2021-12-27|Has expired: Fails to build on modern FreeBSD
+java/intellij-rubymine|devel/rubymine|2021-12-31|Use better name and category
diff --git a/devel/Makefile b/devel/Makefile
index a4f7dbab77e1..a0224019b0f7 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6955,6 +6955,7 @@
     SUBDIR += rubygem-zentest
     SUBDIR += rubygem-zhexdump
     SUBDIR += rubygem-zlib
+    SUBDIR += rubymine
     SUBDIR += rudeconfig
     SUBDIR += rudiments
     SUBDIR += rust-analyzer
diff --git a/java/intellij-rubymine/Makefile b/devel/rubymine/Makefile
similarity index 95%
rename from java/intellij-rubymine/Makefile
rename to devel/rubymine/Makefile
index 213c7e115bb0..65df8ad664bd 100644
--- a/java/intellij-rubymine/Makefile
+++ b/devel/rubymine/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rubymine
 PORTVERSION=	2021.3.1
-CATEGORIES=	java devel
+CATEGORIES=	devel java
 MASTER_SITES=	https://download.jetbrains.com/ruby/ \
 		http://download.jetbrains.com/ruby/
 PKGNAMEPREFIX=	intellij-
@@ -29,7 +29,7 @@ NO_BUILD=	yes
 
 WRKDIST=	${WRKDIR}/RubyMine-${PORTVERSION}
 
-.include "${.CURDIR}/../intellij/common.mk"
+.include "${.CURDIR}/../../java/intellij/common.mk"
 
 PLIST_SUB+=	DATADIR=${DATADIR}
 SUB_FILES+=	rubymine rubymine.desktop pkg-message
diff --git a/java/intellij-rubymine/distinfo b/devel/rubymine/distinfo
similarity index 100%
rename from java/intellij-rubymine/distinfo
rename to devel/rubymine/distinfo
diff --git a/java/intellij-rubymine/files/pkg-message.in b/devel/rubymine/files/pkg-message.in
similarity index 100%
rename from java/intellij-rubymine/files/pkg-message.in
rename to devel/rubymine/files/pkg-message.in
diff --git a/java/intellij-rubymine/files/rubymine.1 b/devel/rubymine/files/rubymine.1
similarity index 100%
rename from java/intellij-rubymine/files/rubymine.1
rename to devel/rubymine/files/rubymine.1
diff --git a/java/intellij-rubymine/files/rubymine.desktop.in b/devel/rubymine/files/rubymine.desktop.in
similarity index 100%
rename from java/intellij-rubymine/files/rubymine.desktop.in
rename to devel/rubymine/files/rubymine.desktop.in
diff --git a/java/intellij-rubymine/files/rubymine.in b/devel/rubymine/files/rubymine.in
similarity index 100%
rename from java/intellij-rubymine/files/rubymine.in
rename to devel/rubymine/files/rubymine.in
diff --git a/java/intellij-rubymine/pkg-descr b/devel/rubymine/pkg-descr
similarity index 100%
rename from java/intellij-rubymine/pkg-descr
rename to devel/rubymine/pkg-descr
diff --git a/java/intellij-rubymine/pkg-plist b/devel/rubymine/pkg-plist
similarity index 100%
rename from java/intellij-rubymine/pkg-plist
rename to devel/rubymine/pkg-plist
diff --git a/java/Makefile b/java/Makefile
index 3976fca2cb1e..18cae5108cc8 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -40,7 +40,6 @@
     SUBDIR += intellij
     SUBDIR += intellij-fsnotifier
     SUBDIR += intellij-pty4j
-    SUBDIR += intellij-rubymine
     SUBDIR += intellij-ultimate
     SUBDIR += jad
     SUBDIR += jai