diff --git a/devel/cgilib/Makefile b/devel/cgilib/Makefile
index 4b22e6fac75d..f6c30ca9ae4a 100644
--- a/devel/cgilib/Makefile
+++ b/devel/cgilib/Makefile
@@ -1,29 +1,31 @@
 # New ports collection makefile for:	cgilib
 # Date created:				8 May 2005
 # Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cgilib
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	devel www
 MASTER_SITES=	http://www.infodrom.org/projects/cgilib/download/ \
 		http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/libs/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A library of procedures for developing CGI programs in C
 
 USE_LDCONFIG=	yes
 
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
-MAN3=		cgiDebug.3 cgiFree.3 cgiFreeList.3 cgiGetCookie.3 \
-		cgiGetCookies.3 cgiGetValue.3 cgiGetVariables.3 cgiHeader.3 \
-		cgiInit.3 cgiRedirect.3 cgiSetHeader.3 cgiSetType.3
+PLIST_FILES=	include/cgi.h lib/libcgi.a lib/libcgi.so lib/libcgi.so.1
+MAN3=		cgiDebug.3 cgiFree.3 cgiFreeList.3 cgiGetCookie.3 cgiEscape.3 \
+		cgiGetFile.3 cgiGetFiles.3 cgiGetCookies.3 cgiGetValue.3 \
+		cgiGetVariables.3 cgiHeader.3 cgiInit.3 cgiRedirect.3 \
+		cgiSetHeader.3 cgiSetType.3
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/cgi.h ${PREFIX}/include
 	${INSTALL_MAN} ${WRKSRC}/*.3 ${PREFIX}/man/man3
 
 .include <bsd.port.mk>
diff --git a/devel/cgilib/distinfo b/devel/cgilib/distinfo
index aa8144a59df8..df636d36beab 100644
--- a/devel/cgilib/distinfo
+++ b/devel/cgilib/distinfo
@@ -1,3 +1,3 @@
-MD5 (cgilib-0.5.tar.gz) = 5187ba11b2ec165b6c5b6629087733b0
-SHA256 (cgilib-0.5.tar.gz) = 7e480fb0bb3e91f51130e2785acdf8e195b75e10b0273c90425e10459264cf35
-SIZE (cgilib-0.5.tar.gz) = 13991
+MD5 (cgilib-0.6.tar.gz) = 392f00a4ce90426606efcb6ce705fd75
+SHA256 (cgilib-0.6.tar.gz) = b825a7ff413c02a758af1e54641d41f24099b9c54c4530b5e6edebe21d9640dd
+SIZE (cgilib-0.6.tar.gz) = 25268
diff --git a/devel/cgilib/files/Makefile.bsd b/devel/cgilib/files/Makefile.bsd
index ad32abca8b8d..b78aee5f0676 100644
--- a/devel/cgilib/files/Makefile.bsd
+++ b/devel/cgilib/files/Makefile.bsd
@@ -1,13 +1,13 @@
 LIB=	cgi
 
-NOPROFILE=	yes
+NO_PROFILE=	yes
 SHLIB_MAJOR?=	1
 SHLIB_MINOR?=	0
 
-SRCS=		cookies.c cgi.c
+SRCS=		cookies.c cgi.c aux.c
 
 CFLAGS+=	-I.
 
 LIBDIR=		${PREFIX}/lib
 
 .include <bsd.lib.mk>
diff --git a/devel/cgilib/files/patch-cgi.c b/devel/cgilib/files/patch-cgi.c
index ff6ed6251db6..4b1ced92e1f3 100644
--- a/devel/cgilib/files/patch-cgi.c
+++ b/devel/cgilib/files/patch-cgi.c
@@ -1,11 +1,33 @@
---- cgi.c.orig	Sat Aug 21 01:14:07 1999
-+++ cgi.c	Sun May  8 22:42:30 2005
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <cgi.h>
+--- cgi.c.orig	2008-05-03 09:51:51.000000000 -0700
++++ cgi.c	2008-05-03 09:52:40.000000000 -0700
+@@ -227,6 +227,30 @@
+     return strdup (template);
+ }
  
- int cgiDebugLevel = 0;
++
++size_t
++strnlen(const char *s, size_t len)
++{
++    size_t i;
++
++    for(i = 0; i < len && s[i]; i++)
++	;
++    return i;
++}
++
++char *
++strndup(const char *old, size_t sz)
++{
++    size_t len = strnlen (old, sz);
++    char *t    = malloc(len + 1);
++
++    if (t != NULL) {
++	memcpy (t, old, len);
++	t[len] = '\0';
++    }
++    return t;
++}
++
+ /* cgiReadMultipart()
+  *
+  * Decode multipart/form-data
diff --git a/devel/cgilib/pkg-plist b/devel/cgilib/pkg-plist
deleted file mode 100644
index e4b2f0021767..000000000000
--- a/devel/cgilib/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-include/cgi.h
-lib/libcgi.a
-lib/libcgi.so
-lib/libcgi.so.1