diff --git a/www/Makefile b/www/Makefile
index 5a9f42e25cda..ed7e4b9df8b2 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -201,6 +201,7 @@
     SUBDIR += p5-Apache-SSI
     SUBDIR += p5-Apache-Session
     SUBDIR += p5-Apache-Session-SharedMem
+    SUBDIR += p5-AxKit
     SUBDIR += p5-CGI-Application
     SUBDIR += p5-CGI-ArgChecker
     SUBDIR += p5-CGI-Cache
diff --git a/www/p5-AxKit/Makefile b/www/p5-AxKit/Makefile
new file mode 100644
index 000000000000..6a427214aac7
--- /dev/null
+++ b/www/p5-AxKit/Makefile
@@ -0,0 +1,69 @@
+# Ports collection Makefile for:		AxKit
+# Date created:					17 Jan 2001
+# Whom:						dom@happygiraffe.net
+#
+# $FreeBSD$
+#
+
+PORTNAME=	AxKit
+PORTVERSION=	1.4
+CATEGORIES=	www
+MASTER_SITES=	http://www.axkit.org/download/
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	dom@happygiraffe.net
+
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
+BUILD_DEPENDS=	\
+		${SITE_PERL}/${PERL_ARCH}/Apache/libapreq.pm:${PORTSDIR}/www/p5-libapreq \
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-XSLT \
+		${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
+		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+USE_PERL5=	yes
+SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		\
+		Apache::AxKit::Language.3 \
+		Apache::AxKit::Language::XPathScript.3 \
+		Apache::AxKit::Language::XSP.3 \
+		Apache::AxKit::Language::XSP::TaglibHelper.3 \
+		Apache::AxKit::Plugins::Fragment.3 \
+		Apache::AxKit::Plugins::Passthru.3 \
+		Apache::AxKit::Provider.3 \
+		Apache::AxKit::StyleChooser::Cookie.3 \
+		Apache::AxKit::StyleChooser::FileSuffix.3 \
+		Apache::AxKit::StyleChooser::PathInfo.3 \
+		Apache::AxKit::StyleChooser::QueryString.3 \
+		Apache::AxKit::StyleChooser::UserAgent.3 \
+		Apache::MimeXML.3 \
+		AxKit.3
+
+PERL_CONFIGURE=	yes
+CONFIGURE_ARGS=	INC='-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2' \
+		LIBS='-L${LOCALBASE}/lib'
+
+do-configure:
+	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL \
+		OPTIMIZE="${CFLAGS}" \
+		INC="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/include"
+
+EX_DIR=${PREFIX}/share/examples/${PORTNAME}
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${EX_DIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${EX_DIR}
+	${CP} -R ${WRKSRC}/axkit.org ${EX_DIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/www/p5-AxKit/distinfo b/www/p5-AxKit/distinfo
new file mode 100644
index 000000000000..536f412c971a
--- /dev/null
+++ b/www/p5-AxKit/distinfo
@@ -0,0 +1 @@
+MD5 (AxKit-1.4.tar.gz) = d930f75f7fad7d92ae67ad268e173672
diff --git a/www/p5-AxKit/pkg-comment b/www/p5-AxKit/pkg-comment
new file mode 100644
index 000000000000..f5c5b31b5c44
--- /dev/null
+++ b/www/p5-AxKit/pkg-comment
@@ -0,0 +1 @@
+XML Delivery Toolkit for Apache/Perl
diff --git a/www/p5-AxKit/pkg-descr b/www/p5-AxKit/pkg-descr
new file mode 100644
index 000000000000..c96848e3b630
--- /dev/null
+++ b/www/p5-AxKit/pkg-descr
@@ -0,0 +1,10 @@
+AxKit --- XML Delivery Toolkit for Apache
+
+AxKit allows serving XML pages through Apache and mod_perl.  It uses
+XSLT stylesheets to transform pages before sending them to the browser.
+It also allows Perl stylesheets for extra flexibility.
+
+AxKit has good caching of results, and can be up to 80% of the speed of
+Apache when serving from it's cache.
+
+WWW: http://www.axkit.org/
diff --git a/www/p5-AxKit/pkg-message b/www/p5-AxKit/pkg-message
new file mode 100644
index 000000000000..9d0d3958428a
--- /dev/null
+++ b/www/p5-AxKit/pkg-message
@@ -0,0 +1,14 @@
+Please consult ``man AxKit'' for instructions on installing AxKit into
+your Apache configuration.
+
+NB: This version of AxKit is only compiled with the ability to use XSLT
+stylesheets.  If you wish to use XPathScript or XSP, you must also
+install the p5-XML-Sablotron port/package.  However, you must also
+recompile your Apache binary to *not* include a builtin version of
+expat.  To see if you need to do this, type in:
+
+	strings `which httpd` | grep XML
+
+If this produces any output, you must recompile apache passing the
+--disable-rule=EXPAT argument to the configure program.  See the FAQ on
+http://axkit.org for full details.
diff --git a/www/p5-AxKit/pkg-plist b/www/p5-AxKit/pkg-plist
new file mode 100644
index 000000000000..44d4ab23771b
--- /dev/null
+++ b/www/p5-AxKit/pkg-plist
@@ -0,0 +1,118 @@
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Cache.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.xs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/ConfigReader.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Exception.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/AxPoint.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/LibXSLT.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/Sablot.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsNITF.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsRDF.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XPathScript.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/TaglibHelper.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Makefile.PL
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser/WAPCheck.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugins/Fragment.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugins/Passthru.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/File.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Filter.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Scalar.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/Cookie.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/FileSuffix.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/PathInfo.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/QueryString.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/UserAgent.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/typemap
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/MimeXML.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/AxKit.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/AxKit.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit/AxKit.so
+share/examples/AxKit/axkit.org/docs/associating_stylesheets.xml
+share/examples/AxKit/axkit.org/docs/index.xml
+share/examples/AxKit/axkit.org/docs/introduction.dkb
+share/examples/AxKit/axkit.org/docs/provider-howto.dkb
+share/examples/AxKit/axkit.org/docs/quick_start.dkb
+share/examples/AxKit/axkit.org/docs/xpathscript/guide.dkb
+share/examples/AxKit/axkit.org/docs/xsp/guide.dkb
+share/examples/AxKit/axkit.org/docs/xsp/index.xml
+share/examples/AxKit/axkit.org/docs/xsp/sqltaglib.dkb
+share/examples/AxKit/axkit.org/examples/cv.css
+share/examples/AxKit/axkit.org/examples/cv.xml
+share/examples/AxKit/axkit.org/examples/cv.xps
+share/examples/AxKit/axkit.org/examples/cv_example.xml
+share/examples/AxKit/axkit.org/examples/docbook.dkb
+share/examples/AxKit/axkit.org/examples/resume.dtd
+share/examples/AxKit/axkit.org/faq.xml
+share/examples/AxKit/axkit.org/features.xml
+share/examples/AxKit/axkit.org/img/arrow.gif
+share/examples/AxKit/axkit.org/img/arrow_sel.gif
+share/examples/AxKit/axkit.org/img/banner2.gif
+share/examples/AxKit/axkit.org/img/banner3.gif
+share/examples/AxKit/axkit.org/img/banner_axkit.gif
+share/examples/AxKit/axkit.org/img/banner_bg.gif
+share/examples/AxKit/axkit.org/img/banner_end.gif
+share/examples/AxKit/axkit.org/img/bg.gif
+share/examples/AxKit/axkit.org/img/bullet.gif
+share/examples/AxKit/axkit.org/img/corner_logo.jpg
+share/examples/AxKit/axkit.org/img/corner_logo.png
+share/examples/AxKit/axkit.org/img/nav_bot.gif
+share/examples/AxKit/axkit.org/img/nav_left.gif
+share/examples/AxKit/axkit.org/img/nav_right.gif
+share/examples/AxKit/axkit.org/img/nav_top.gif
+share/examples/AxKit/axkit.org/img/pix.gif
+share/examples/AxKit/axkit.org/img/rcorner_br.gif
+share/examples/AxKit/axkit.org/img/rcorner_wh.gif
+share/examples/AxKit/axkit.org/img/vsep.gif
+share/examples/AxKit/axkit.org/index.xml
+share/examples/AxKit/axkit.org/install.xml
+share/examples/AxKit/axkit.org/license.xml
+share/examples/AxKit/axkit.org/mailinglist.xml
+share/examples/AxKit/axkit.org/news.xml
+share/examples/AxKit/axkit.org/sidebar.xml
+share/examples/AxKit/axkit.org/sidebar_new.xml
+share/examples/AxKit/axkit.org/stylesheets/axkit.css
+share/examples/AxKit/axkit.org/stylesheets/axkit_html.css
+share/examples/AxKit/axkit.org/stylesheets/docbook_example.xml
+share/examples/AxKit/axkit.org/stylesheets/docbook_print.xps
+share/examples/AxKit/axkit.org/stylesheets/docbook_screen.xps
+share/examples/AxKit/axkit.org/stylesheets/docbook_tags.xps
+share/examples/AxKit/axkit.org/stylesheets/new/rdf_html.xps
+share/examples/AxKit/axkit.org/stylesheets/new/sidebar_html.xps
+share/examples/AxKit/axkit.org/stylesheets/new/webpage_html.xps
+share/examples/AxKit/axkit.org/stylesheets/rdf_html.xps
+share/examples/AxKit/axkit.org/stylesheets/sidebar_html.xps
+share/examples/AxKit/axkit.org/stylesheets/spacer.xps
+share/examples/AxKit/axkit.org/stylesheets/webpage_html.xps
+share/examples/AxKit/axkit.org/support.xml
+share/examples/AxKit/default.notxslt
+share/examples/AxKit/default.xps
+share/examples/AxKit/docbook.dkb
+share/examples/AxKit/docbook_print.xps
+share/examples/AxKit/docbook_screen.xps
+share/examples/AxKit/docbook_tags.xps
+share/examples/AxKit/index.xml
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Language
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Plugins
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/Provider
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/AxKit
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AxKit
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AxKit
+@dirrm share/examples/AxKit/axkit.org/stylesheets/new
+@dirrm share/examples/AxKit/axkit.org/stylesheets
+@dirrm share/examples/AxKit/axkit.org/img
+@dirrm share/examples/AxKit/axkit.org/examples
+@dirrm share/examples/AxKit/axkit.org/docs/xsp
+@dirrm share/examples/AxKit/axkit.org/docs/xpathscript
+@dirrm share/examples/AxKit/axkit.org/docs
+@dirrm share/examples/AxKit/axkit.org
+@dirrm share/examples/AxKit