diff --git a/irc/Makefile b/irc/Makefile
index 2a65205ec864..bc93e122f84d 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -4,6 +4,7 @@
     SUBDIR += bitchx
     SUBDIR += blackened
     SUBDIR += bnc
+    SUBDIR += bobot++
     SUBDIR += dcc
     SUBDIR += dircproxy
     SUBDIR += epic4
diff --git a/irc/bobot++/Makefile b/irc/bobot++/Makefile
new file mode 100644
index 000000000000..5a555fe80493
--- /dev/null
+++ b/irc/bobot++/Makefile
@@ -0,0 +1,47 @@
+# ex:ts=8
+# New ports collection makefile for:	bobot++
+# Date created:			Sep 7, 2001
+# Whom:				ijliao
+#
+# $FreeBSD$
+#
+
+PORTNAME=	bobot++
+PORTVERSION=	1.97
+CATEGORIES=	irc
+MASTER_SITES=	http://pltplp.net/bobot++/archive/
+DISTNAME=	${PORTNAME}.${PORTVERSION}
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	ports@FreeBSD.org
+
+GNU_CONFIGURE=	yes
+
+.if defined(WITH_GUILE)
+LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
+GUILE_CONFIG=	${LOCALBASE}/bin/guile-config
+CONFIGURE_ARGS+=	--enable-script
+.endif
+
+.if defined(WITH_TELNET)
+CONFIGURE_ARGS+=	--enable-telnetserver
+.endif
+
+post-patch:
+	@${PERL} -pi -e "s,%%GUILE_CONFIG%%,${GUILE_CONFIG},g ; \
+		s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g ; \
+		s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bobot++ ${PREFIX}/bin
+
+.if !defined(NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	${CP} ${WRKSRC}/doc/* ${DOCSDIR}
+	@${MKDIR} ${DATADIR}
+	${CP} -R ${WRKSRC}/examples ${DATADIR}
+	${CP} -R ${WRKSRC}/scripts ${DATADIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/irc/bobot++/distinfo b/irc/bobot++/distinfo
new file mode 100644
index 000000000000..b185fe56b154
--- /dev/null
+++ b/irc/bobot++/distinfo
@@ -0,0 +1 @@
+MD5 (bobot++.1.97.tgz) = e41c1927ff13cdf77e5386de7fba6270
diff --git a/irc/bobot++/files/patch-configure b/irc/bobot++/files/patch-configure
new file mode 100644
index 000000000000..7c736fac64c7
--- /dev/null
+++ b/irc/bobot++/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Fri Sep  7 21:52:05 2001
++++ configure	Fri Sep  7 21:53:18 2001
+@@ -545,8 +545,8 @@
+   enableval="$enable_script"
+   
+   if test $enableval = "yes"; then
+-    GUILE_DEFINES="-DUSESCRIPTS -DMULTITHREAD"
+-    GUILE_LIBS="-lguile"
++    GUILE_DEFINES="-DUSESCRIPTS -DMULTITHREAD `%%GUILE_CONFIG%% compile` %%PTHREAD_CFLAGS%%"
++    GUILE_LIBS="-lguile `%%GUILE_CONFIG%% link` %%PTHREAD_LIBS%%"
+     GUILE_SOURCES="BotInterp.C Interp.C ScriptCommands.C"
+     GUILE_INCLUDES="BotInterp.H Interp.H ScriptCommands.H"
+   fi
diff --git a/irc/bobot++/files/patch-source::Makefile.in b/irc/bobot++/files/patch-source::Makefile.in
new file mode 100644
index 000000000000..ff59337842f5
--- /dev/null
+++ b/irc/bobot++/files/patch-source::Makefile.in
@@ -0,0 +1,13 @@
+--- source/Makefile.in.orig	Fri Sep  7 21:53:43 2001
++++ source/Makefile.in	Fri Sep  7 21:53:51 2001
+@@ -4,8 +4,8 @@
+ DEFINES=@HAVE_STL_CLEAR@ @DISABLE_CRYPT@ @GUILE_DEFINES@ @TSERVER_DEFINES@
+ 
+ RM=rm -f
+-CXX=@CXX@ -g
+-CXXFLAGS=$(DEFINES)
++CXX=@CXX@
++CXXFLAGS+=$(DEFINES)
+ LDFLAGS=@LDFLAGS@ @GUILE_LIBS@
+ 
+ SOURCES=BanEntry.C \
diff --git a/irc/bobot++/pkg-comment b/irc/bobot++/pkg-comment
new file mode 100644
index 000000000000..5a15f14d7953
--- /dev/null
+++ b/irc/bobot++/pkg-comment
@@ -0,0 +1 @@
+An IRC bot written in C++
diff --git a/irc/bobot++/pkg-descr b/irc/bobot++/pkg-descr
new file mode 100644
index 000000000000..cfee0bd26198
--- /dev/null
+++ b/irc/bobot++/pkg-descr
@@ -0,0 +1,3 @@
+The bobot++ is an IRC bot written in C++.
+
+WWW: http://pltplp.net/bobot++/
diff --git a/irc/bobot++/pkg-plist b/irc/bobot++/pkg-plist
new file mode 100644
index 000000000000..fe339a6a0f0e
--- /dev/null
+++ b/irc/bobot++/pkg-plist
@@ -0,0 +1,19 @@
+bin/bobot++
+%%PORTDOCS%%share/doc/bobot++/index.html
+%%PORTDOCS%%share/bobot++/examples/bot.log
+%%PORTDOCS%%share/bobot++/examples/bot.help
+%%PORTDOCS%%share/bobot++/examples/bot.init
+%%PORTDOCS%%share/bobot++/examples/bot.conf
+%%PORTDOCS%%share/bobot++/examples/bot.shit
+%%PORTDOCS%%share/bobot++/examples/bot.users
+%%PORTDOCS%%share/bobot++/examples/bot.autoexec
+%%PORTDOCS%%share/bobot++/scripts/country
+%%PORTDOCS%%share/bobot++/scripts/hello
+%%PORTDOCS%%share/bobot++/scripts/tamere
+%%PORTDOCS%%share/bobot++/scripts/uname
+%%PORTDOCS%%share/bobot++/scripts/uptime
+%%PORTDOCS%%share/bobot++/scripts/boulet
+%%PORTDOCS%%@dirrm share/doc/bobot++
+%%PORTDOCS%%@dirrm share/bobot++/examples
+%%PORTDOCS%%@dirrm share/bobot++/scripts
+%%PORTDOCS%%@dirrm share/bobot++