diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile
index 2359404f7a2c..6b431f8ce823 100644
--- a/graphics/openjpeg15/Makefile
+++ b/graphics/openjpeg15/Makefile
@@ -7,20 +7,22 @@ CATEGORIES=	graphics
 MASTER_SITES=	SF/openjpeg.mirror/${PORTVERSION}/
 PKGNAMESUFFIX=	15
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Open-source JPEG 2000 codec
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libpng15.so:${PORTSDIR}/graphics/png \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2
-
-USES=		cmake dos2unix
-DOS2UNIX_FILES=	libopenjpeg/opj_malloc.h
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
 OPTIONS_DEFINE=	DOCS
 
+DOS2UNIX_FILES=	libopenjpeg/opj_malloc.h
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USES=		cmake cpe dos2unix
+
+PORTDOCS=	CHANGES LICENSE
+
 .include <bsd.port.mk>
diff --git a/graphics/openjpeg15/pkg-descr b/graphics/openjpeg15/pkg-descr
index ce3b146262d8..055e519a8d66 100644
--- a/graphics/openjpeg15/pkg-descr
+++ b/graphics/openjpeg15/pkg-descr
@@ -1,10 +1,16 @@
-The OpenJPEG library is an open-source JPEG 2000 codec written in
-C language.  It has been developed in order to promote the use of
-JPEG 2000, the new still-image compression standard from the Joint
-Photographic Experts Group (JPEG).  In addition to the basic codec,
-various other features are under development, among them the JP2
-and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful
-for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer
-for j2k-images, ...
+The OpenJPEG library is an open-source JPEG 2000 library developed in order to
+promote the use of JPEG 2000.
 
-WWW: http://code.google.com/p/openjpeg/
+The main part of the project consists in a JPEG 2000 codec compliant with the
+Part 1 of the standard (Class-1 Profile-1 compliance).
+
+Besides this main codec, OpenJPEG integrates several other modules:
+- JP2 (JPEG 2000 standard Part 2 - Handling of JP2 boxes and extended multiple
+  component transforms for multispectral and hyperspectral imagery)
+- MJ2 (JPEG 2000 standard Part 3)
+- JPWL (JPEG 2000 standard Part 11)
+- JPIP (JPEG 2000 standard Part 9)
+- OPJViewer, a GUI viewer for J2K, JP2, JPWL and MJ2 files
+
+WWW: https://code.google.com/p/openjpeg/
+WWW: http://openjpeg.mirror.sourceforge.net/
diff --git a/graphics/openjpeg15/pkg-plist b/graphics/openjpeg15/pkg-plist
index ad77a1033da6..e3c91b1e03e2 100644
--- a/graphics/openjpeg15/pkg-plist
+++ b/graphics/openjpeg15/pkg-plist
@@ -9,12 +9,9 @@ man/man1/image_to_j2k.1.gz
 man/man1/j2k_dump.1.gz
 man/man1/j2k_to_image.1.gz
 man/man3/libopenjpeg.3.gz
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%DATADIR%%/OpenJPEGConfig.cmake
 %%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%DATADIR%%/OpenJPEGTargets.cmake
 libdata/pkgconfig/libopenjpeg.pc
 libdata/pkgconfig/libopenjpeg1.pc
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%