diff --git a/www/Makefile b/www/Makefile
index 3d302092d769..caa66644c246 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -649,6 +649,7 @@
     SUBDIR += p5-HTML-WikiConverter-PhpWiki
     SUBDIR += p5-HTML-WikiConverter-PmWiki
     SUBDIR += p5-HTML-WikiConverter-SnipSnap
+    SUBDIR += p5-HTML-WikiConverter-Socialtext
     SUBDIR += p5-HTML-WikiConverter-TikiWiki
     SUBDIR += p5-HTML-WikiConverter-UseMod
     SUBDIR += p5-HTML-WikiConverter-WakkaWiki
diff --git a/www/p5-HTML-WikiConverter-Socialtext/Makefile b/www/p5-HTML-WikiConverter-Socialtext/Makefile
new file mode 100644
index 000000000000..0c638ae5e927
--- /dev/null
+++ b/www/p5-HTML-WikiConverter-Socialtext/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	p5-HTML-WikiConverter-Socialtext
+# Date created:				2006/09/08
+# Whom:	      				chinsan <chinsan.tw@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	HTML-WikiConverter-Socialtext
+PORTVERSION=	0.03
+CATEGORIES=	www perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	HTML
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	chinsan.tw@gmail.com
+COMMENT=	Convert HTML to Socialtext markup
+
+BUILD_DEPENDS=	p5-HTML-WikiConverter>=0.60:${PORTSDIR}/www/p5-HTML-WikiConverter \
+		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+PERL_CONFIGURE=	yes
+
+MAN3=		HTML::WikiConverter::Socialtext.3
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+IGNORE=		requires perl 5.8.x or later due to Unicode escapes
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/p5-HTML-WikiConverter-Socialtext/distinfo b/www/p5-HTML-WikiConverter-Socialtext/distinfo
new file mode 100644
index 000000000000..ea4b4222013a
--- /dev/null
+++ b/www/p5-HTML-WikiConverter-Socialtext/distinfo
@@ -0,0 +1,3 @@
+MD5 (HTML-WikiConverter-Socialtext-0.03.tar.gz) = 2001a7476eded9d6a7685e072ee9e6c8
+SHA256 (HTML-WikiConverter-Socialtext-0.03.tar.gz) = e634a3d5dda350b40a7d16fd0be2f07d84e174c1cb698d11a7b56c42bb102bde
+SIZE (HTML-WikiConverter-Socialtext-0.03.tar.gz) = 6680
diff --git a/www/p5-HTML-WikiConverter-Socialtext/pkg-descr b/www/p5-HTML-WikiConverter-Socialtext/pkg-descr
new file mode 100644
index 000000000000..6007756ccd6b
--- /dev/null
+++ b/www/p5-HTML-WikiConverter-Socialtext/pkg-descr
@@ -0,0 +1,5 @@
+This module contains rules for converting HTML into Socialtext markup. See
+HTML::WikiConverter for additional usage details.
+
+WWW: http://search.cpan.org/dist/HTML-WikiConverter-Socialtext/
+Author:	Kirsten Jones <synedra at cpan.org>
diff --git a/www/p5-HTML-WikiConverter-Socialtext/pkg-plist b/www/p5-HTML-WikiConverter-Socialtext/pkg-plist
new file mode 100644
index 000000000000..6e168fef1a8c
--- /dev/null
+++ b/www/p5-HTML-WikiConverter-Socialtext/pkg-plist
@@ -0,0 +1,4 @@
+%%SITE_PERL%%/HTML/WikiConverter/Socialtext.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Socialtext/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/Socialtext
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter