diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index d750b2beaa57..0eb29e63cc6c 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mapping table between 8-bit chars and Unicode
 
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Unicode-String>=2:converters/p5-Unicode-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/converters/p5-Unicode-Map8/pkg-descr b/converters/p5-Unicode-Map8/pkg-descr
index 574e7039400d..12559d27ed2a 100644
--- a/converters/p5-Unicode-Map8/pkg-descr
+++ b/converters/p5-Unicode-Map8/pkg-descr
@@ -1,22 +1,6 @@
-Unicode::Map8
--------------
-
-The Unicode::Map8 class implement efficient mapping tables between
-8-bit character sets and 16 bit character sets like Unicode.  About
-170 different mapping tables between various known character sets and
-Unicode is distributed with this package.  The source of these tables
-is the vendor mapping tables provided by Unicode, Inc. and the code
-tables in RFC 1345.  New maps can easily be installed.
-
-By coincidence Martin Schwartz created a similar module at the same
-time I did.  His module is called Unicode::Map and should be available
-on CPAN too.  Both modules now support a unified interface.  Martin's
-module will be depreciated in the future.
-
-Since UTF8 support is coming to Perl soon, there might be good reasons
-to move this module in the direction of mapping to/from UTF8.  I will
-probably do so, once the Unicode support in the Perl core settle.
-
-COPYRIGHT   1998-1999 Gisle Aas. All rights reserved.
+The Unicode::Map8 class implement efficient mapping tables between 8-bit
+character sets and 16 bit character sets like Unicode. The tables are efficient
+both in terms of space allocated and translation speed. The 16-bit strings is
+assumed to use network byte order.
 
 WWW: http://search.cpan.org/dist/Unicode-Map8/
diff --git a/converters/p5-Unicode-Map8/pkg-plist b/converters/p5-Unicode-Map8/pkg-plist
index 76d377ec6c92..94c37c85ee32 100644
--- a/converters/p5-Unicode-Map8/pkg-plist
+++ b/converters/p5-Unicode-Map8/pkg-plist
@@ -182,5 +182,5 @@ bin/umap
 %%SITE_ARCH%%/Unicode/Map8/maps/us-dk.bin
 %%SITE_ARCH%%/Unicode/Map8/maps/videotex-suppl.bin
 %%SITE_ARCH%%/auto/Unicode/Map8/Map8.so
-%%PERL5_MAN3%%/Unicode::Map8.3.gz
 %%PERL5_MAN1%%/umap.1.gz
+%%PERL5_MAN3%%/Unicode::Map8.3.gz