diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index e82107ccc72e..20ab7a49a51a 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -1,97 +1,97 @@
 # New ports collection makefile for:	libbobcat
 # Date created:		March 4, 2009
 # Whom:	      		Gabor Pali <pgj@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libbobcat
-PORTVERSION=	2.07.04
+PORTVERSION=	2.08.01
 CATEGORIES=	devel
 MASTER_SITES=	SF/bobcat/bobcat/${PORTVERSION}
 DISTNAME=	bobcat_${PORTVERSION}
 EXTRACT_SUFX=	.orig.tar.gz
 
 MAINTAINER=	pgj@FreeBSD.org
 COMMENT=	Brokken's Own Base Classes And Templates
 
 BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
 		${LOCALBASE}/include/X11/Xlib.h:${PORTSDIR}/x11/libX11 \
 		yodl>=2.0:${PORTSDIR}/textproc/yodl \
 		g++45:${PORTSDIR}/lang/gcc45
 
 MANCOMPRESSED=	yes
 MAN1=		bobcatlcgen.1
 MAN3=		a2x.3bobcat align.3bobcat arg.3bobcat argconfig.3bobcat \
 		autoptr.3bobcat bigint.3bobcat binarysearch.3bobcat \
 		cgi.3bobcat clientsocket.3bobcat cmdfinder.3bobcat \
 		cmdfinderbase.3bobcat configfile.3bobcat datetime.3bobcat \
 		decryptbuf.3bobcat digestbuf.3bobcat encryptbuf.3bobcat \
 		errno.3bobcat fnwrap.3bobcat fnwrap1.3bobcat fnwrap1c.3bobcat \
 		fnwrap2.3bobcat fnwrap2c.3bobcat foreach.3bobcat \
 		fork.3bobcat fswap.3bobcat gethostent.3bobcat glob.3bobcat \
 		hash.3bobcat hmacbuf.3bobcat hostent.3bobcat hostname.3bobcat \
 		ifdstream.3bobcat ifdstreambuf.3bobcat indent.3bobcat \
 		inetaddress.3bobcat iostream.3bobcat iostreambuf.3bobcat \
 		irandstream.3bobcat lc.3bobcat level.3bobcat lm.3bobcat \
 		localclientsocket.3bobcat localserversocket.3bobcat \
 		localsocketbase.3bobcat log.3bobcat logbuffer.3bobcat \
 		mailheaders.3bobcat manipulators.3bobcat milter.3bobcat \
 		mlm.3bobcat msg.3bobcat multistreambuf.3bobcat \
 		ofdstream.3bobcat ofdstreambuf.3bobcat \
 		ofilterstreambuf.3bobcat ofoldstream.3bobcat \
 		ofoldstreambuf.3bobcat ohexstreambuf.3bobcat onekey.3bobcat \
 		pattern.3bobcat pipe.3bobcat process.3bobcat \
 		randbuffer.3bobcat redirector.3bobcat refcount.3bobcat \
 		repeat.3bobcat selector.3bobcat serversocket.3bobcat \
 		socketbase.3bobcat stat.3bobcat string.3bobcat \
 		syslogbuf.3bobcat syslogstream.3bobcat table.3bobcat \
-		tablesupport.3bobcat typetrait.3bobcat user.3bobcat \
-		x2a.3bobcat xpointer.3bobcat
+		tablebuf.3bobcat tablelines.3bobcat tablesupport.3bobcat \
+		typetrait.3bobcat user.3bobcat x2a.3bobcat xpointer.3bobcat
 MAN7=		bobcat.7
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/bobcat-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
 BUILD_DEPENDS+=	openssl>=0.9.8:${PORTSDIR}/security/openssl
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
 		s|"/share/doc/libbobcat2"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \
 		s|"/share/doc/libbobcat2-dev"|"/share/doc/${PORTNAME}-${PORTVERSION}/dev"| ; \
 		s|"/share/man"|"/man"| ; \
 		s|"-d"|"-Pp"| ; \
 		s|#define MANHTML|| ; \
 		s|g++|g++45| ; \
 		s|gcc|gcc45|' \
 		${WRKSRC}/INSTALL.im
 	@${REINPLACE_CMD} -e 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake| ; \
 		s|"-Itmp -Wall -O3"|"-Itmp -I${LOCALBASE}/include -Wall ${CXXFLAGS}"|' \
 		${WRKSRC}/build
 	@${REINPLACE_CMD} -e 's|"cp -r |"cp -R |' \
 		${WRKSRC}/icmake/install
 	@${REINPLACE_CMD} -e 's|-lssl|-lssl -L${LOCALBASE}/lib| ; \
 		s|-lX11|-lX11 -L${LOCALBASE}/lib| ; \
 		s|-lmilter|-lmilter -lpthread|' \
 		${WRKSRC}/icmake/special
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|#define DOCOTHER||' \
 		${WRKSRC}/INSTALL.im
 .endif
 
 do-build:
 	@cd ${WRKSRC} && ./build libraries all strip && ./build lcgen && ./build man
 
 do-install:
 	@cd ${WRKSRC} && ./build install
 
 .include <bsd.port.post.mk>
diff --git a/devel/libbobcat/distinfo b/devel/libbobcat/distinfo
index 110f2eb10277..953f0f21760a 100644
--- a/devel/libbobcat/distinfo
+++ b/devel/libbobcat/distinfo
@@ -1,3 +1,3 @@
-MD5 (bobcat_2.07.04.orig.tar.gz) = 83c4d7126d5fe37f997265397a1b73fd
-SHA256 (bobcat_2.07.04.orig.tar.gz) = 22e91b3988345dde17941d8511145822a757f9c2ae36441c1fa9dc9d826b18cc
-SIZE (bobcat_2.07.04.orig.tar.gz) = 639453
+MD5 (bobcat_2.08.01.orig.tar.gz) = 769a373b20a6d1aaa4f268e018af96d7
+SHA256 (bobcat_2.08.01.orig.tar.gz) = 270c6768c7fe86f0371f524a6ec80f9737092309103fdaceaa3b3624225c235d
+SIZE (bobcat_2.08.01.orig.tar.gz) = 597400
diff --git a/devel/libbobcat/pkg-plist b/devel/libbobcat/pkg-plist
index f5cb12126830..bd9c6bb37bc7 100644
--- a/devel/libbobcat/pkg-plist
+++ b/devel/libbobcat/pkg-plist
@@ -1,82 +1,85 @@
 @comment $FreeBSD$
 bin/bobcatlcgen
 include/bobcat/a2x
 include/bobcat/align
 include/bobcat/arg
 include/bobcat/argconfig
 include/bobcat/autoptr
 include/bobcat/bigint
 include/bobcat/cgi
 include/bobcat/clientsocket
 include/bobcat/cmdfinder
 include/bobcat/cmdfinderbase
 include/bobcat/configfile
 include/bobcat/datetime
 include/bobcat/decryptbuf
 include/bobcat/digestbuf
 include/bobcat/encryptbuf
 include/bobcat/errno
 include/bobcat/fnwrap
 include/bobcat/fnwrap1
 include/bobcat/fnwrap1c
 include/bobcat/fnwrap2
 include/bobcat/fnwrap2c
 include/bobcat/foreach
 include/bobcat/fork
 include/bobcat/fswap
 include/bobcat/gethostent
 include/bobcat/glob
 include/bobcat/hash
 include/bobcat/hmacbuf
 include/bobcat/hostent
 include/bobcat/hostname
 include/bobcat/ifdstream
 include/bobcat/ifdstreambuf
 include/bobcat/indent
 include/bobcat/inetaddress
 include/bobcat/iostream
 include/bobcat/iostreambuf
 include/bobcat/irandstream
 include/bobcat/lc
 include/bobcat/level
 include/bobcat/localclientsocket
 include/bobcat/localserversocket
 include/bobcat/localsocketbase
 include/bobcat/log
 include/bobcat/logbuffer
 include/bobcat/mailheaders
 include/bobcat/milter
 include/bobcat/msg
 include/bobcat/multistreambuf
 include/bobcat/ofdstream
 include/bobcat/ofdstreambuf
 include/bobcat/ofilterstreambuf
 include/bobcat/ofoldstream
 include/bobcat/ofoldstreambuf
 include/bobcat/ohexstreambuf
 include/bobcat/onekey
 include/bobcat/pattern
 include/bobcat/pipe
 include/bobcat/process
 include/bobcat/randbuffer
 include/bobcat/redirector
 include/bobcat/refcount
 include/bobcat/repeat
 include/bobcat/selector
 include/bobcat/serversocket
 include/bobcat/socketbase
 include/bobcat/stat
 include/bobcat/string
 include/bobcat/syslogbuf
 include/bobcat/syslogstream
 include/bobcat/table
+include/bobcat/tablebase
+include/bobcat/tablebuf
+include/bobcat/tablelines
 include/bobcat/tablesupport
 include/bobcat/typetrait
 include/bobcat/user
 include/bobcat/x2a
 include/bobcat/xpointer
 lib/libbobcat.a
 lib/libbobcat.so
 lib/libbobcat.so.%%PORTVERSION%%
 lib/libbobcat.so.2
 @dirrm include/bobcat