diff --git a/net-im/Makefile b/net-im/Makefile
index 35fdbec1a7d0..9f047fa6b269 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -19,6 +19,7 @@
     SUBDIR += firetalk
     SUBDIR += fugu
     SUBDIR += gaim
+    SUBDIR += gaim-assistant
     SUBDIR += gaim-bangexec
     SUBDIR += gaim-extprefs
     SUBDIR += gaim-guifications
diff --git a/net-im/gaim-assistant/Makefile b/net-im/gaim-assistant/Makefile
new file mode 100644
index 000000000000..9f1edbdf970f
--- /dev/null
+++ b/net-im/gaim-assistant/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for:   gaim-assistant
+# Date created:                                10 Dec 2005
+# Whom:                                        Remington Lang <MrL0Lz@gmail.com>
+#
+# $FreeBSD$
+
+PORTNAME=	gaim-assistant
+PORTVERSION=	0.1.0
+CATEGORIES=	net-im
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	MrL0Lz@gmail.com
+COMMENT=	Plugin that forwards messages to a different screen name
+
+BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
+
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gtk20
+
+GNU_CONFIGURE=	yes
+
+PLIST_FILES=	lib/gaim/gaim-assistant.so
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/gaim-assistant.so ${PREFIX}/lib/gaim
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+CFLAGS+=	-fPIC
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net-im/gaim-assistant/distinfo b/net-im/gaim-assistant/distinfo
new file mode 100644
index 000000000000..58a75497e798
--- /dev/null
+++ b/net-im/gaim-assistant/distinfo
@@ -0,0 +1,3 @@
+MD5 (gaim-assistant-0.1.0.tar.gz) = 43c5ae25c13acc0434668c3c56c0ead4
+SHA256 (gaim-assistant-0.1.0.tar.gz) = cbe764e5bf1581c9029c2ebf86b1b16e6cd3f76ec2d5920fb0bbc68ab67194aa
+SIZE (gaim-assistant-0.1.0.tar.gz) = 351203
diff --git a/net-im/gaim-assistant/pkg-descr b/net-im/gaim-assistant/pkg-descr
new file mode 100644
index 000000000000..db3dcd757b0b
--- /dev/null
+++ b/net-im/gaim-assistant/pkg-descr
@@ -0,0 +1,4 @@
+Gaim Assistant is a plugin to Gaim that will allow you to forward
+messages to a different screen name should you become away.
+
+WWW: http://gaim-assistant.tulg.org/