diff --git a/MOVED b/MOVED
index f950b6664d0d..f79bdb52e083 100644
--- a/MOVED
+++ b/MOVED
@@ -3144,3 +3144,4 @@ editors/semi113||2007-08-05|Expired: distfile no longer available
 deskutils/intclock|x11-clocks/intclock|2007-08-08|Moved to a more appropriate category
 net/smokeping|net-mgmt/smokeping|2007-08-10|Moved to a more appropriate category
 net/rrdtool10|databases/rrdtool10|2007-08-11|Moved to a more appropriate category
+net/jrobin|databases/jrobin|2007-08-11|Moved to a more appropriate category
diff --git a/databases/Makefile b/databases/Makefile
index d89689dea34e..28f5feee6811 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -91,6 +91,7 @@
     SUBDIR += jdb
     SUBDIR += jdbc-oracle8i
     SUBDIR += jdbc-oracle9i
+    SUBDIR += jrobin
     SUBDIR += kbibtex
     SUBDIR += keximdb
     SUBDIR += kinterbasdb
diff --git a/databases/jrobin/Makefile b/databases/jrobin/Makefile
index 124a3a63573f..b7cb0683e4ac 100644
--- a/databases/jrobin/Makefile
+++ b/databases/jrobin/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	jrobin
 PORTVERSION=	1.5.4
 PORTREVISION=	1
-CATEGORIES=	net java
+CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
diff --git a/net/Makefile b/net/Makefile
index b87f2cdd1326..3c15873ee45b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -230,7 +230,6 @@
     SUBDIR += jakarta-commons-net
     SUBDIR += java-beepcore
     SUBDIR += jcifs
-    SUBDIR += jrobin
     SUBDIR += jsch
     SUBDIR += jumpgate
     SUBDIR += jwhois
diff --git a/net/jrobin/Makefile b/net/jrobin/Makefile
deleted file mode 100644
index 124a3a63573f..000000000000
--- a/net/jrobin/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:	JRobin
-# Date created:			Mar 9, 2005
-# Whom:				ijliao
-#
-# $FreeBSD$
-#
-
-PORTNAME=	jrobin
-PORTVERSION=	1.5.4
-PORTREVISION=	1
-CATEGORIES=	net java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
-
-MAINTAINER=	nemoliu@FreeBSD.org
-COMMENT=	A pure Java alternative to RRDTool
-
-USE_JAVA=	yes
-USE_ANT=	yes
-JAVA_VERSION=	1.5+
-ALL_TARGET=	dist
-WRKSRC=		${WRKDIR}/JRobinLite-${PORTVERSION}
-BUILD_WRKSRC=	${WRKSRC}/ant
-
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-PORTDOCS=	*
-.endif
-
-CLASSES=	jrobin convertor inspector
-
-do-install:
-.for c in ${CLASSES}
-	${INSTALL_DATA} ${WRKSRC}/lib/${c}-${PORTVERSION}.jar ${JAVAJARDIR}/${c}.jar
-	@${ECHO} '${JAVAJARDIR:S,^${PREFIX}/,,}/${c}.jar' >> ${TMPPLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/jrobin/distinfo b/net/jrobin/distinfo
deleted file mode 100644
index 532ef3481658..000000000000
--- a/net/jrobin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (jrobin-1.5.4-1.tar.gz) = 57f87893ff9ddca1efa9d1a68bba6c2b
-SHA256 (jrobin-1.5.4-1.tar.gz) = 82cfc2fa8f22da4919391a8f100d1a1eaaac5599e4688180c27f231845c47a3d
-SIZE (jrobin-1.5.4-1.tar.gz) = 752043
diff --git a/net/jrobin/pkg-descr b/net/jrobin/pkg-descr
deleted file mode 100644
index 3d699b201a9d..000000000000
--- a/net/jrobin/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-JRobin is a 100% pure java implementation of RRDTool's functionality. It
-follows the same logic and uses the same data sources, archive types and
-definitions as RRDTool does. JRobin supports all standard operations on
-Round Robin Database (RRD) files: CREATE, UPDATE, FETCH, LAST, DUMP, XPORT
-and GRAPH. JRobin's API is made for those who are familiar with RRDTool's
-concepts and logic, but prefer to work with pure java. If you provide the
-same data to RRDTool and JRobin, you will get exactly the same results and
-graphs. JRobin is made from the scratch and it uses very limited portions
-of RRDTool's original source code. JRobin does not use native functions and
-libraries, has no Runtime.exec() calls and does not require RRDTool to be
-present. JRobin is distributed as a software library (jar files) and comes
-with full java source code (LGPL licence).
-
-WWW: http://www.jrobin.org/