diff --git a/devel/Makefile b/devel/Makefile
index 6517dfd39940..35147b1f726b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -968,6 +968,7 @@
     SUBDIR += swig13
     SUBDIR += swig13-doc
     SUBDIR += swigruby
+    SUBDIR += syntax_tools
     SUBDIR += sysconftool
     SUBDIR += t1lib
     SUBDIR += tcl-memchan
diff --git a/devel/syntax_tools/Makefile b/devel/syntax_tools/Makefile
new file mode 100644
index 000000000000..656e9e55690d
--- /dev/null
+++ b/devel/syntax_tools/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	syntax_tools
+# Date Created:				18 July 2003
+# Whom:				 	olgeni@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	syntax_tools
+PORTVERSION=	1.2
+CATEGORIES=	devel
+MASTER_SITES=	http://erlang.org/contrib/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	olgeni@FreeBSD.org
+COMMENT=	Erlang modules for code manipulation
+
+BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
+
+PLIST_SUB=	VERSION="${PORTVERSION}"
+
+SYNTAX_TOOLS=	${PREFIX}/lib/erlang/lib/syntax_tools-${PORTVERSION}
+
+post-extract:
+		@${RM} ${WRKSRC}/demo.erl ${WRKSRC}/test.erl
+
+do-build:
+		@cd ${WRKSRC} && erlc *.erl
+
+do-install:
+		@${MKDIR} ${SYNTAX_TOOLS}
+		@${MKDIR} ${SYNTAX_TOOLS}/src
+		@${MKDIR} ${SYNTAX_TOOLS}/ebin
+		@${MKDIR} ${SYNTAX_TOOLS}/doc
+		@${INSTALL_DATA} ${WRKSRC}/*.erl ${SYNTAX_TOOLS}/src
+		@${INSTALL_DATA} ${WRKSRC}/*.beam ${SYNTAX_TOOLS}/ebin
+		@${INSTALL_DATA} ${WRKSRC}/doc/* ${SYNTAX_TOOLS}/doc
+		@${LN} -sf ${SYNTAX_TOOLS} ${PREFIX}/lib/erlang/lib/syntax_tools
+
+.include <bsd.port.mk>
diff --git a/devel/syntax_tools/distinfo b/devel/syntax_tools/distinfo
new file mode 100644
index 000000000000..295e70962cbc
--- /dev/null
+++ b/devel/syntax_tools/distinfo
@@ -0,0 +1 @@
+MD5 (syntax_tools-1.2.tgz) = 4e9b4e801d6c58b1ea8e6dab494919fe
diff --git a/devel/syntax_tools/pkg-descr b/devel/syntax_tools/pkg-descr
new file mode 100644
index 000000000000..fa60add6b7d7
--- /dev/null
+++ b/devel/syntax_tools/pkg-descr
@@ -0,0 +1,4 @@
+Erlang modules for analysis and manipulation, flexible pretty
+printing, and preservation of source-code comments.
+
+WWW: http://erlang.org/user.html
diff --git a/devel/syntax_tools/pkg-plist b/devel/syntax_tools/pkg-plist
new file mode 100644
index 000000000000..056acd22968c
--- /dev/null
+++ b/devel/syntax_tools/pkg-plist
@@ -0,0 +1,33 @@
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/epp_dodger.html
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/erl_comment_scan.html
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/erl_prettypr.html
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/erl_recomment.html
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/erl_syntax.html
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/erl_syntax_lib.html
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/erl_tidy.html
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/index.html
+lib/erlang/lib/syntax_tools-%%VERSION%%/doc/stylesheet.css
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/epp_dodger.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/erl_comment_scan.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/erl_prettypr.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/erl_recomment.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/erl_syntax.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/erl_syntax_lib.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/erl_tidy.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/prettypr.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/ebin/proplists.beam
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/epp_dodger.erl
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/erl_comment_scan.erl
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/erl_prettypr.erl
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/erl_recomment.erl
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/erl_syntax.erl
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/erl_syntax_lib.erl
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/erl_tidy.erl
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/prettypr.erl
+lib/erlang/lib/syntax_tools-%%VERSION%%/src/proplists.erl
+@dirrm lib/erlang/lib/syntax_tools-%%VERSION%%/src
+@dirrm lib/erlang/lib/syntax_tools-%%VERSION%%/ebin
+@dirrm lib/erlang/lib/syntax_tools-%%VERSION%%/doc
+@dirrm lib/erlang/lib/syntax_tools-%%VERSION%%
+@exec ln -sf syntax_tools-%%VERSION%% %D/lib/erlang/lib/syntax_tools
+@unexec rm -f %D/lib/erlang/lib/syntax_tools