diff --git a/java/collections/Makefile b/java/collections/Makefile
index 19e26b43e75f..88c2d9d7eec6 100644
--- a/java/collections/Makefile
+++ b/java/collections/Makefile
@@ -7,16 +7,15 @@
 
 PORTNAME=	collections
 PORTVERSION=	1.1
-CATEGORIES=	java
+CATEGORIES=	java devel
 DISTNAME=	collections1_1
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	java@freebsd.org
-COMMENT=	JDK1.2 Collections' API for JDK1.1 environments
+COMMENT=	JDK1.2 Collections\' API for JDK1.1 environments
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.1
-JAVA_RUN=	jre
 
 USE_ZIP=	YES
 
@@ -28,24 +27,24 @@ NO_CDROM=	"See the license"
 PORTDOCS=	LICENSE.TXT README.TXT javadoc
 .endif
 JARFILE=	collections.jar
-PLIST_FILES+=	${JAVAJARDIR:S,^${PREFIX}/,,}/${JARFILE}
+PLIST_FILES+=	%%JAVAJARDIR%%/${JARFILE}
 
 .include <bsd.port.pre.mk>
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	"You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from http://java.sun.com/products/archive/javabeans/infobus/downloads.html and place it in ${DISTDIR} then run make again"
+DOWNLOAD_URL=	"http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7264-collections-1.1-oth-JPR&SiteId=JSC&TransactionId=noreg"
+IGNORE=	"You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again"
 .endif
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
 	@${MKDIR} ${JAVAJARDIR}
-	@${CP} ${WRKSRC}/lib/${JARFILE} ${JAVAJARDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/lib/${JARFILE} ${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	@${CP} -R ${WRKSRC}/doc/${DOCFILE} ${DOCSDIR}/
-.endfor
+	@cd ${WRKSRC}/doc \
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
diff --git a/java/collections/pkg-descr b/java/collections/pkg-descr
index d6d20617199f..03fbad8ec1a3 100644
--- a/java/collections/pkg-descr
+++ b/java/collections/pkg-descr
@@ -1,3 +1,3 @@
 JDK1.2 Collections' API for JDK1.1 environments.
 
-WWW: http://java.sun.com/products/javabeans/infobus/collectionsreadme.html
+WWW: http://java.sun.com/products/archive/javabeans/infobus/collectionsreadme.html