diff --git a/dns/Makefile b/dns/Makefile
index ec483cbb1215..4462dcdd7721 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -56,6 +56,7 @@
     SUBDIR += h2n
     SUBDIR += hesiod
     SUBDIR += idnkit
+    SUBDIR += idnkit2
     SUBDIR += inadyn
     SUBDIR += ipcheck
     SUBDIR += ldapdns
diff --git a/dns/idnkit2/Makefile b/dns/idnkit2/Makefile
new file mode 100644
index 000000000000..e1be3af779f5
--- /dev/null
+++ b/dns/idnkit2/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for:	idnkit
+# Date created:		13 November 2011
+# Whom:			Rafal Lesniak <fbsd@grid.einherjar.de>
+#
+# $FreeBSD$
+
+PORTNAME=	idnkit
+PORTVERSION=	2.1
+CATEGORIES=	dns
+MASTER_SITES=	http://jprs.co.jp/idn/
+
+MAINTAINER=	fbsd@grid.einherjar.de
+COMMENT=	Internationalized Domain Name toolkit 2
+
+LICENSE_PERMS=	# permissive
+LICENSE_NAME=	OSCL
+LICENSE_FILE=	LICENSE.txt
+
+CONFLICTS_INSTALL=	idnkit-1.*
+
+USE_AUTOTOOLS=	libtool
+USE_ICONV=	yes
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libiconv=${LOCALBASE}
+
+USE_LDCONFIG=	yes
+
+MAN1=	idncheck.1 idncmp.1 idnconv2.1
+MAN3=	idn_checkname.3 idn_comparenames.3 idn_comparenames2.3 \
+	idn_decodename.3 idn_decodename2.3 idn_encodename.3 idn_nameinit.3 \
+	idn_result_tostring.3 idn_setlanguage.3 idn_setlocalcheckfile.3 \
+	idn_setlocalencoding.3 idn_version_getstring.3 idn_version_idnatable.3 \
+	idn_version_libidn.3 idn_version_unicode.3 libidnkit.3 libidnkitlite.3
+MAN5=	idn2.conf.5 idn2rc.5 idnalias.conf.5 idnlang.conf.5
+MANCOMPRESSED=	no
+
+.include <bsd.port.mk>
diff --git a/dns/idnkit2/distinfo b/dns/idnkit2/distinfo
new file mode 100644
index 000000000000..39a50f78b976
--- /dev/null
+++ b/dns/idnkit2/distinfo
@@ -0,0 +1,2 @@
+SHA256 (idnkit-2.1.tar.bz2) = 45510a556e7543955f917249527e455297baa2277d2776b5d6a66daf1bd06474
+SIZE (idnkit-2.1.tar.bz2) = 1424595
diff --git a/dns/idnkit2/pkg-descr b/dns/idnkit2/pkg-descr
new file mode 100644
index 000000000000..8e56b01f9f89
--- /dev/null
+++ b/dns/idnkit2/pkg-descr
@@ -0,0 +1,13 @@
+
+Internationalized Domain Name toolkit 2 (idnkit-2) provides useful
+APIs (libraries) for application developers to make softwares
+IDNA2008-compliant, and also provides tools for system administrators
+to process IDNs appropriately according to IDNA2008 specification.
+The idnkit-2 is a toolkit revised by JPRS from the idnkit-1.0
+developed by JPNIC, and it is released as an open source
+free software modified to comply with IDNA2008.
+
+idnkit-2 consists from its main part written in C and additional
+API packages for other languages (Java, Python, and Perl).
+
+WWW:	http://jprs.co.jp/idn/index-e.html
diff --git a/dns/idnkit2/pkg-plist b/dns/idnkit2/pkg-plist
new file mode 100644
index 000000000000..37029fb2f066
--- /dev/null
+++ b/dns/idnkit2/pkg-plist
@@ -0,0 +1,29 @@
+bin/idncheck
+bin/idncmp
+bin/idnconv2
+bin/idnslookup2
+@unexec cmp -s %D/etc/idn2.conf.sample %D/etc/idn2.conf && rm -f %D/etc/idn2.conf || true
+etc/idn2.conf.sample
+@exec [ -f %B/idn2.conf ] || cp -p %D/%F %B/idn2.conf
+@unexec cmp -s %D/etc/idnalias.conf.sample %D/etc/idnalias.conf && rm -f %D/etc/idnalias.conf || true
+etc/idnalias.conf.sample
+@exec [ -f %B/idnalias.conf ] || cp -p %D/%F %B/idnalias.conf
+include/idn/api.h
+include/idn/export.h
+include/idn/res.h
+include/idn/resconf.h
+include/idn/result.h
+include/idn/version.h
+lib/libidnkit.a
+lib/libidnkit.la
+lib/libidnkit.so
+lib/libidnkit.so.2
+lib/libidnkitlite.a
+lib/libidnkitlite.la
+lib/libidnkitlite.so
+lib/libidnkitlite.so.2
+%%DATADIR%%/map/ja.map
+%%DATADIR%%/map/tr.map
+@dirrm %%DATADIR%%/map
+@dirrm %%DATADIR%%
+@dirrm include/idn