diff --git a/editors/Makefile b/editors/Makefile
index c9489f3efc53..15e47c40f1c7 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -68,6 +68,7 @@
     SUBDIR += gnotepad+
     SUBDIR += gnuserv
     SUBDIR += gnuserv-emacs20
+    SUBDIR += gobby
     SUBDIR += gphpedit
     SUBDIR += hexcurse
     SUBDIR += hexedit
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
new file mode 100644
index 000000000000..6fc3b9c0054e
--- /dev/null
+++ b/editors/gobby/Makefile
@@ -0,0 +1,28 @@
+# Ports collection makefile for:  gobby
+# Date created:			  28 September 2005
+# Whom:				  Wesley Shields <wxs@csh.rit.edu>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gobby
+PORTVERSION=	0.2.2
+CATEGORIES=	editors
+MASTER_SITES=	http://releases.0x539.de/gobby/
+
+MAINTAINER=	wxs@csh.rit.edu
+COMMENT=	A free collaborative editor
+
+LIB_DEPENDS=	xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \
+		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		net6-1.1.0:${PORTSDIR}/net/net6 \
+		obby-0.2.0:${PORTSDIR}/devel/obby
+
+USE_XLIB=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack pkgconfig gtksourceview
+USE_GCC=	3.4
+
+PLIST_FILES=	bin/gobby
+
+.include <bsd.port.mk>
diff --git a/editors/gobby/distinfo b/editors/gobby/distinfo
new file mode 100644
index 000000000000..af223bb0fa46
--- /dev/null
+++ b/editors/gobby/distinfo
@@ -0,0 +1,3 @@
+MD5 (gobby-0.2.2.tar.gz) = 9a1b61ee3aebe737e5d9918f7601b5d4
+SHA256 (gobby-0.2.2.tar.gz) = 56c4dcf121eb496ac0b1d212783e3c7f01e427359a768ffa952355093a985eda
+SIZE (gobby-0.2.2.tar.gz) = 258917
diff --git a/editors/gobby/pkg-descr b/editors/gobby/pkg-descr
new file mode 100644
index 000000000000..3771b46a8e08
--- /dev/null
+++ b/editors/gobby/pkg-descr
@@ -0,0 +1,3 @@
+A free collaborative editor.
+
+WWW: http://gobby.0x539.de