diff --git a/devel/looks/Makefile b/devel/looks/Makefile
index 41e8c3429e1d..891588cd0e77 100644
--- a/devel/looks/Makefile
+++ b/devel/looks/Makefile
@@ -2,57 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	looks
-PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTVERSION=	2.5.2
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.jgoodies.com/download/libraries/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|_|g}
+DISTNAME=	jgoodies-${PORTNAME}-${PORTVERSION:S|.|_|g}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The JGoodies Looks improve the appearance of your Java applications
+COMMENT=	JGoodies Looks improve the appearance of your Java applications
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-10-20
+LICENSE=	BSD
 
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/jgoodies-${PORTNAME}-${PORTVERSION}
 
-JARFILE=	${PORTNAME}.jar
+JARFILE=	jgoodies-${PORTNAME}-${PORTVERSION}.jar
 
-###
-# potential conflict with java/jcalendar, both install looksXXX.jar
-###
-
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}	\
-		%%JAVAJARDIR%%/LICENSE.${PORTNAME}.txt
+PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
 DOCFILES=	README.html RELEASE-NOTES.txt
-EXAMPLES=	demo.jar lib/forms-1.0.7.jar tiny.jar
 PORTDOCS=	*
 
-.if !defined(NOPORTDOCS)
-PLIST_FILES+=	${EXAMPLES:S|^|%%EXAMPLESDIR%%/|}
-PLIST_DIRS+=	%%EXAMPLESDIR%%/lib %%EXAMPLESDIR%%
-.endif
-
-post-extract:
-	@${MV} ${WRKSRC}/LICENSE.txt ${WRKSRC}/LICENSE.${PORTNAME}.txt
+.include <bsd.port.options.mk>
 
 do-install:
-	${INSTALL_DATA} ${JARFILE:S|.jar|-${PORTVERSION}.jar|:S|^|${WRKSRC}/|}	\
-		${JAVAJARDIR}/${JARFILE}
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE.${PORTNAME}.txt ${JAVAJARDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}/lib
+	${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/|} ${DOCSDIR}
-	@${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}
+	@(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-	@${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/demo/|:S|lib|../lib|} ${EXAMPLESDIR}
-	@${MV} ${EXAMPLESDIR}/forms-1.0.7.jar ${EXAMPLESDIR}/lib
-	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/looks/distinfo b/devel/looks/distinfo
index 164e8526edd2..246bf4fa4c0d 100644
--- a/devel/looks/distinfo
+++ b/devel/looks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (looks-2_0_4.zip) = 203cfd1f12f0e5e0b901a145f91701106adad1131694823f0104b54b4ed0c619
-SIZE (looks-2_0_4.zip) = 1952358
+SHA256 (jgoodies-looks-2_5_2.zip) = edd0670c972715c0951094bdeac88047c8836097aea1e78c720d2fe78e8dbbbd
+SIZE (jgoodies-looks-2_5_2.zip) = 2466231
diff --git a/devel/looks/pkg-descr b/devel/looks/pkg-descr
index dd503f660a1d..ab021563d8ad 100644
--- a/devel/looks/pkg-descr
+++ b/devel/looks/pkg-descr
@@ -1,4 +1,4 @@
 The JGoodies look&feels make your Swing applications and applets look better.
 They have been optimized for readability, precise micro-design and usability.
 
-WWW:	https://looks.dev.java.net/
+WWW: http://www.jgoodies.com