diff --git a/www/Makefile b/www/Makefile
index 7bcd3d488247..cb7205e07da1 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1455,6 +1455,7 @@
     SUBDIR += twiki-CommentPlugin
     SUBDIR += twiki-EditTablePlugin
     SUBDIR += twiki-EmptyPlugin
+    SUBDIR += twiki-GluePlugin
     SUBDIR += twiki-InterwikiPlugin
     SUBDIR += twiki-JSCalendarContrib
     SUBDIR += twiki-LdapContrib
diff --git a/www/twiki-GluePlugin/Makefile b/www/twiki-GluePlugin/Makefile
new file mode 100644
index 000000000000..284bda67401e
--- /dev/null
+++ b/www/twiki-GluePlugin/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	twiki-GluePlugin
+# Date created:		9 Jan 2009
+# Whom:			Sergey Skvortsov <skv@protey.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	GluePlugin
+SVNREV=		15708
+
+MAINTAINER=	skv@FreeBSD.org
+COMMENT=	Allow to format tags and arguments on multiple lines
+
+.include "${.CURDIR}/../twiki/bsd.twiki.mk"
+.include <bsd.port.mk>
diff --git a/www/twiki-GluePlugin/distinfo b/www/twiki-GluePlugin/distinfo
new file mode 100644
index 000000000000..70503ea84e1c
--- /dev/null
+++ b/www/twiki-GluePlugin/distinfo
@@ -0,0 +1,3 @@
+MD5 (twiki/GluePlugin-0.0.15708.tar.bz2) = d28b02110d29e45b5ade0ca629fc39ac
+SHA256 (twiki/GluePlugin-0.0.15708.tar.bz2) = 1b6547b43395a7a9e60c008b84bede4bc977e8a107209985a938d982e8caa095
+SIZE (twiki/GluePlugin-0.0.15708.tar.bz2) = 7661
diff --git a/www/twiki-GluePlugin/pkg-descr b/www/twiki-GluePlugin/pkg-descr
new file mode 100644
index 000000000000..1873147bb504
--- /dev/null
+++ b/www/twiki-GluePlugin/pkg-descr
@@ -0,0 +1,8 @@
+This plugin will help you to write readable markup (TWikiMarkup, HMTL,
+...) within TWiki by allowing tags and arguments to be formatted on
+multiple lines.  This is done by removing whitespaces surrounding tilde
+characters at the beginning of a line and recombine consecutive lines
+again.
+
+Author: Michael Daum
+WWW: http://twiki.org/cgi-bin/view/Plugins/GluePlugin
diff --git a/www/twiki-GluePlugin/pkg-plist b/www/twiki-GluePlugin/pkg-plist
new file mode 100644
index 000000000000..971bf3918aa3
--- /dev/null
+++ b/www/twiki-GluePlugin/pkg-plist
@@ -0,0 +1,17 @@
+%%TWDIR%%/data/TWiki/GluePlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/GluePlugin/DEPENDENCIES
+%%TWDIR%%/lib/TWiki/Plugins/GluePlugin/MANIFEST
+%%TWDIR%%/lib/TWiki/Plugins/GluePlugin/build.pl
+%%TWDIR%%/lib/TWiki/Plugins/GluePlugin.pm
+%%TWDIR%%/pub/TWiki/GluePlugin/wikiringlogo40x40.png
+@dirrm %%TWDIR%%/data/TWiki
+@dirrm %%TWDIR%%/data
+@dirrm %%TWDIR%%/lib/TWiki/Plugins/GluePlugin
+@dirrm %%TWDIR%%/lib/TWiki/Plugins
+@dirrm %%TWDIR%%/lib/TWiki
+@dirrm %%TWDIR%%/lib
+@dirrm %%TWDIR%%/pub/TWiki/GluePlugin
+@dirrm %%TWDIR%%/pub/TWiki
+@dirrm %%TWDIR%%/pub
+@dirrm %%TWDIR%%
+@dirrmtry share/twiki