diff --git a/archivers/rubygem-minitar/Makefile b/archivers/rubygem-minitar/Makefile
index ff26c3f40229..3e8adf2bd8cb 100644
--- a/archivers/rubygem-minitar/Makefile
+++ b/archivers/rubygem-minitar/Makefile
@@ -2,22 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	minitar
-PORTVERSION=	0.5.4
+PORTVERSION=	0.6.1
 CATEGORIES=	archivers rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Library and command-line utility for tar archives
 
-LICENSE=	GPLv2 GPLv3 RUBY
+LICENSE=	BSD3CLAUSE RUBY
 LICENSE_COMB=	dual
-
-CONFLICTS_INSTALL=	rubygem-archive-tar-minitar
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/docs/bsdl.txt
+LICENSE_FILE_RUBY=	${WRKSRC}/docs/ruby.txt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem
 
-PLIST_FILES=	bin/minitar
-
 .include <bsd.port.mk>
diff --git a/archivers/rubygem-minitar/distinfo b/archivers/rubygem-minitar/distinfo
index 97f45bebc913..8a27e6b0ef90 100644
--- a/archivers/rubygem-minitar/distinfo
+++ b/archivers/rubygem-minitar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/minitar-0.5.4.gem) = 6aae3dafcf83b5d3f4f2485edbca202a0ae054ba2e3b204c24cc07dcaa93edee
-SIZE (rubygem/minitar-0.5.4.gem) = 23552
+TIMESTAMP = 1496571843
+SHA256 (rubygem/minitar-0.6.1.gem) = df5cdcdd5ecdcc1100cf3513557748f726bb1feea55f5cc25bb5a7116f069ddd
+SIZE (rubygem/minitar-0.6.1.gem) = 29184
diff --git a/archivers/rubygem-minitar/pkg-descr b/archivers/rubygem-minitar/pkg-descr
index 7e815786e840..78e9ce004b45 100644
--- a/archivers/rubygem-minitar/pkg-descr
+++ b/archivers/rubygem-minitar/pkg-descr
@@ -1,3 +1,12 @@
-Ruby library and command-line utility for tar archives.
+The minitar (previously called Archive::Tar::Minitar) library is a pure-Ruby
+library that provides the ability to deal with POSIX tar(1) archive files.
+
+This is release 0.6+, providing a number of bug fixes including a directory
+traversal vulnerability, CVE-2016-10173. This release starts the migration and
+modernization of the code:
+- the minitar command-line program has been separated into the minitar-cli gem;
+  and
+- the archive-tar-minitar gem now points to the minitar and minitar-cli gems and
+  discourages its installation.
 
 WWW: https://github.com/halostatue/minitar