diff --git a/security/Makefile b/security/Makefile
index 1210240f20e8..49fdf43549a7 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -517,6 +517,7 @@
     SUBDIR += p5-Crypt-GeneratePassword
     SUBDIR += p5-Crypt-HCE_MD5
     SUBDIR += p5-Crypt-HCE_SHA
+    SUBDIR += p5-Crypt-HSXKPasswd
     SUBDIR += p5-Crypt-IDEA
     SUBDIR += p5-Crypt-Imail
     SUBDIR += p5-Crypt-Juniper
diff --git a/security/p5-Crypt-HSXKPasswd/Makefile b/security/p5-Crypt-HSXKPasswd/Makefile
new file mode 100644
index 000000000000..43acc0215916
--- /dev/null
+++ b/security/p5-Crypt-HSXKPasswd/Makefile
@@ -0,0 +1,31 @@
+# Created by: Zeus Panchenko <zeus@gnu.org.ua>
+# $FreeBSD$
+
+PORTNAME=	Crypt-HSXKPasswd
+PORTVERSION=	3.6
+DISTVERSIONPREFIX=	v
+CATEGORIES=	security perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	perl@FreeBSD.org
+COMMENT=	Secure memorable password generator inspired by XKCD
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	p5-Clone>=0:devel/p5-Clone \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Math-Round>=0:math/p5-Math-Round \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny
+TEST_DEPENDS=	p5-File-Share>=0:devel/p5-File-Share
+
+NO_ARCH=	yes
+USES=		perl5
+USE_PERL5=	configure
+
+.include <bsd.port.mk>
diff --git a/security/p5-Crypt-HSXKPasswd/distinfo b/security/p5-Crypt-HSXKPasswd/distinfo
new file mode 100644
index 000000000000..564e8faef6f4
--- /dev/null
+++ b/security/p5-Crypt-HSXKPasswd/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1439325702
+SHA256 (Crypt-HSXKPasswd-v3.6.tar.gz) = 959dcc5f9f011bf00b85ad22df566b7ab2bf5ea1d362b0de0fb5ae29fbc458b3
+SIZE (Crypt-HSXKPasswd-v3.6.tar.gz) = 17938667
diff --git a/security/p5-Crypt-HSXKPasswd/pkg-descr b/security/p5-Crypt-HSXKPasswd/pkg-descr
new file mode 100644
index 000000000000..2fc35b1905dc
--- /dev/null
+++ b/security/p5-Crypt-HSXKPasswd/pkg-descr
@@ -0,0 +1,4 @@
+A secure memorable password generator inspired by the wonderful XKCD
+webcomic and Steve Gibson's Password Haystacks webpage.
+
+WWW: https://metacpan.org/release/Crypt-HSXKPasswd
diff --git a/security/p5-Crypt-HSXKPasswd/pkg-plist b/security/p5-Crypt-HSXKPasswd/pkg-plist
new file mode 100644
index 000000000000..37884779ca7f
--- /dev/null
+++ b/security/p5-Crypt-HSXKPasswd/pkg-plist
@@ -0,0 +1,23 @@
+bin/hsxkpasswd
+%%PERL5_MAN1%%/hsxkpasswd.1.gz
+%%PERL5_MAN3%%/Crypt::HSXKPasswd.3.gz
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Util.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/ES.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/PT.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/NL.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/DE.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/Basic.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/EN.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/System.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/IT.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Dictionary/FR.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/RNG/RandomDotOrg.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/RNG/Data_Entropy.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/RNG/DevUrandom.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/RNG/Math_Random_Secure.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/RNG/Basic.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/RNG.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Helper.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd/Types.pm
+%%SITE_PERL%%/Crypt/HSXKPasswd.pm