diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index ec6a7b603f0..b2aee459ddf 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,37 +1,43 @@
-# $OpenBSD: Makefile,v 1.26 2007/09/15 20:38:21 merdely Exp $
+# $OpenBSD: Makefile,v 1.27 2008/10/19 08:42:55 ajacoutot Exp $
 
-COMMENT=		Fast and light gtk-based web browser
+COMMENT=		fast and light graphical web browser
 
-VERSION=		0.8.6
-DISTNAME=		dillo-${VERSION}
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		dillo-2.0
 CATEGORIES=     	www
 
 HOMEPAGE=		http://www.dillo.org/
 
-MAINTAINER=		Jim Uhl <juhl@mala.bc.ca>
+MAINTAINER=		James Turner <james@bsdgroup.org>
 
-# GPL license
+# GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xi c crypto glib gmodule iconv intl m \
-			pthread ssl stdc++ z 
+
+WANTLIB=	X11 Xext Xft Xi Xinerama Xrender c crypto fontconfig m \
+		pthread ssl stdc++ z
+
+MODULES=		converters/libiconv
 
 MASTER_SITES=		${HOMEPAGE}download/
 
 EXTRACT_SUFX=	.tar.bz2
 
+BUILD_DEPENDS=	::x11/fltk2
 LIB_DEPENDS=    jpeg.>=62::graphics/jpeg \
-                png.>=2::graphics/png \
-		gtk.>=1.2,gdk.>=1.2::x11/gtk+
+                png.>=2::graphics/png
 
 USE_X11=		Yes
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--enable-cookies --enable-ipv6 --disable-dlgui
+CONFIGURE_ARGS=		--enable-ipv6 \
+			--disable-threaded-dns
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/dillo
+
 .include <bsd.port.mk>
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 63b49ff94f5..2d6a967f005 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,5 +1,5 @@
-MD5 (dillo-0.8.6.tar.bz2) = tlIz02i70mWlXv/PLBf4Sw==
-RMD160 (dillo-0.8.6.tar.bz2) = Biz/hbMwpbRD3cgaNW6B+TBnfLs=
-SHA1 (dillo-0.8.6.tar.bz2) = 7gOxG6a3XTGAypBtgnW9Neh2WZU=
-SHA256 (dillo-0.8.6.tar.bz2) = R+aVpdNw62VvXkHuuRetYoGxVZv2AXLJ7KibVRip+bk=
-SIZE (dillo-0.8.6.tar.bz2) = 441739
+MD5 (dillo-2.0.tar.bz2) = u5mZyr602z2RVofeRl2+sA==
+RMD160 (dillo-2.0.tar.bz2) = 9FfloDHYoOaCvlDuFsv7o/6jTqo=
+SHA1 (dillo-2.0.tar.bz2) = m95+q1yDXhNQjWOhkKi87E6UVTo=
+SHA256 (dillo-2.0.tar.bz2) = hH0dsxvWirmrlLZCsM1ArI08+BaQD11WUhJJhmAd8ek=
+SIZE (dillo-2.0.tar.bz2) = 551569
diff --git a/www/dillo/patches/patch-Makefile_in b/www/dillo/patches/patch-Makefile_in
index 99533418552..eef179c0ca9 100644
--- a/www/dillo/patches/patch-Makefile_in
+++ b/www/dillo/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2006/09/22 04:13:19 pvalchev Exp $
---- Makefile.in.orig	Wed Apr 26 09:07:27 2006
-+++ Makefile.in	Tue Jun 20 21:09:58 2006
-@@ -252,12 +252,12 @@
- uninstall-info-am:
+$OpenBSD: patch-Makefile_in,v 1.4 2008/10/19 08:42:55 ajacoutot Exp $
+--- Makefile.in.orig	Fri Oct 17 07:13:44 2008
++++ Makefile.in	Fri Oct 17 07:14:31 2008
+@@ -254,12 +254,12 @@ distclean-hdr:
+ 	-rm -f config.h stamp-h1
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+-	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
 +	$(mkdir_p) $(PREFIX)/share/examples/dillo/
  	@list='$(sysconf_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/www/dillo/patches/patch-configure b/www/dillo/patches/patch-configure
new file mode 100644
index 00000000000..eb34d99fe0e
--- /dev/null
+++ b/www/dillo/patches/patch-configure
@@ -0,0 +1,18 @@
+$OpenBSD: patch-configure,v 1.4 2008/10/19 08:42:55 ajacoutot Exp $
+--- configure.orig	Fri Oct 17 06:47:30 2008
++++ configure	Fri Oct 17 06:47:46 2008
+@@ -7604,14 +7604,6 @@ cat >d_size.h <<_______EOF
+ 
+ #include "config.h"
+ 
+-#if HAVE_STDINT_H == 0
+-#include <stdint.h>
+-#else
+-typedef signed $gint16    int16_t;
+-typedef unsigned $gint16  uint16_t;
+-typedef signed $gint32      int32_t;
+-typedef unsigned $gint32    uint32_t;
+-#endif
+ typedef unsigned char   uchar_t;
+ typedef unsigned short  ushort_t;
+ typedef unsigned long   ulong_t;
diff --git a/www/dillo/patches/patch-dpi_datauri_c b/www/dillo/patches/patch-dpi_datauri_c
index 2ceeb61b25c..5bfb24d13aa 100644
--- a/www/dillo/patches/patch-dpi_datauri_c
+++ b/www/dillo/patches/patch-dpi_datauri_c
@@ -1,12 +1,12 @@
-$OpenBSD: patch-dpi_datauri_c,v 1.1 2006/09/22 04:13:19 pvalchev Exp $
---- dpi/datauri.c.orig	Tue Jan 17 07:23:00 2006
-+++ dpi/datauri.c	Sat Jul  1 16:32:03 2006
-@@ -298,7 +298,7 @@
+$OpenBSD: patch-dpi_datauri_c,v 1.2 2008/10/19 08:42:55 ajacoutot Exp $
+--- dpi/datauri.c.orig	Sat Oct 18 10:57:54 2008
++++ dpi/datauri.c	Sat Oct 18 10:59:16 2008
+@@ -296,7 +296,7 @@ int main(void)
     data = datauri_get_data(url, &data_size);
  
     MSG("mime_type: %s\n", mime_type);
--   MSG("data_size: %d\n", data_size);
-+   MSG("data_size: %ld\n", data_size);
+-   MSG("data_size: %d\n", (int)data_size);
++   MSG("data_size: %ld\n", (int)data_size);
     MSG("data: {%s}\n", data);
  
     if (mime_type && data) {
diff --git a/www/dillo/patches/patch-dpi_file_c b/www/dillo/patches/patch-dpi_file_c
deleted file mode 100644
index 331b9a01a8f..00000000000
--- a/www/dillo/patches/patch-dpi_file_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-dpi_file_c,v 1.1 2006/09/22 04:13:19 pvalchev Exp $
---- dpi/file.c.orig	Tue Apr 11 10:50:23 2006
-+++ dpi/file.c	Sat Jul  1 16:30:45 2006
-@@ -615,7 +615,7 @@
-    /* Send HTTP stream */
-    sock_handler_printf(Client->sh, 0,
-       "Content-Type: %s\n"
--      "Content-length: %ld\n\n",
-+      "Content-length: %lld\n\n",
-       ct, sb->st_size);
- 
-    /* Send raw file contents */
diff --git a/www/dillo/patches/patch-dpi_https_c b/www/dillo/patches/patch-dpi_https_c
new file mode 100644
index 00000000000..8fb2e299921
--- /dev/null
+++ b/www/dillo/patches/patch-dpi_https_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-dpi_https_c,v 1.1 2008/10/19 08:42:55 ajacoutot Exp $
+--- dpi/https.c.orig	Fri Oct 17 07:39:18 2008
++++ dpi/https.c	Fri Oct 17 07:39:29 2008
+@@ -69,7 +69,6 @@
+ 
+ 
+ #define ENABLE_SSL
+-#undef ENABLE_SSL
+ #ifdef ENABLE_SSL
+ 
+ #include <openssl/ssl.h>
diff --git a/www/dillo/patches/patch-dpid_Makefile_in b/www/dillo/patches/patch-dpid_Makefile_in
index 5f9e01b207d..26f27b2892a 100644
--- a/www/dillo/patches/patch-dpid_Makefile_in
+++ b/www/dillo/patches/patch-dpid_Makefile_in
@@ -1,14 +1,24 @@
-$OpenBSD: patch-dpid_Makefile_in,v 1.2 2004/12/04 20:44:27 couderc Exp $
---- dpid/Makefile.in.orig	Mon Oct 25 13:12:18 2004
-+++ dpid/Makefile.in	Sat Dec  4 21:20:12 2004
-@@ -475,8 +475,8 @@ uninstall-am: uninstall-binPROGRAMS unin
+$OpenBSD: patch-dpid_Makefile_in,v 1.3 2008/10/19 08:42:55 ajacoutot Exp $
+--- dpid/Makefile.in.orig	Fri Oct 10 16:48:19 2008
++++ dpid/Makefile.in	Fri Oct 17 07:25:33 2008
+@@ -485,13 +485,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIP
  
  
  install-data-local :
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 -	echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc
-+	$(mkdir_p) $(PREFIX)/share/examples/dillo
+-	echo >> $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo "proto.file=file/file.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
++	$(mkinstalldirs) $(PREFIX)/share/examples/dillo/
 +	echo dpi_dir=$(libdir)/dillo/dpi > $(PREFIX)/share/examples/dillo/dpidrc
++	echo >> $(PREFIX)/share/examples/dillo/dpidrc
++	echo "proto.file=file/file.dpi" >> $(PREFIX)/share/examples/dillo/dpidrc
++	echo "proto.ftp=ftp/ftp.filter.dpi" >> $(PREFIX)/share/examples/dillo/dpidrc
++	echo "proto.https=https/https.filter.dpi" >> $(PREFIX)/share/examples/dillo/dpidrc
++	echo "proto.data=datauri/datauri.filter.dpi" >> $(PREFIX)/share/examples/dillo/dpidrc
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/www/dillo/patches/patch-dpid_main_c b/www/dillo/patches/patch-dpid_main_c
index 566e63bd9b8..df0cfd3ee36 100644
--- a/www/dillo/patches/patch-dpid_main_c
+++ b/www/dillo/patches/patch-dpid_main_c
@@ -1,21 +1,21 @@
-$OpenBSD: patch-dpid_main_c,v 1.2 2004/12/04 20:44:27 couderc Exp $
---- dpid/main.c.orig	Fri May 21 16:13:49 2004
-+++ dpid/main.c	Wed Aug 18 17:47:53 2004
-@@ -67,7 +67,7 @@ int start_filter_plugin(struct dp dpi_at
+$OpenBSD: patch-dpid_main_c,v 1.3 2008/10/19 08:42:55 ajacoutot Exp $
+--- dpid/main.c.orig	Tue Sep 30 16:27:32 2008
++++ dpid/main.c	Sat Oct 18 11:14:19 2008
+@@ -69,7 +69,7 @@ static int start_filter_plugin(struct dp dpi_attr)
     }
-    if ( pid == 0) {
+    if (pid == 0) {
        /* Child, start plugin */
 -      if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
 +      if (execl(dpi_attr.path, dpi_attr.path, (void *)NULL) == -1) {
           ERRMSG("start_plugin", "execl", errno);
-          fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
+          MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
           exit(1);
-@@ -99,7 +99,7 @@ void start_server_plugin(struct dp dpi_a
-       fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
+@@ -101,7 +101,7 @@ static void start_server_plugin(struct dp dpi_attr)
+       MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
        exit(1);
     }
 -   if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
 +   if (execl(dpi_attr.path, dpi_attr.path, (void *)NULL) == -1) {
        ERRMSG("start_plugin", "execl", errno);
-       fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
+       MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
        exit(1);
diff --git a/www/dillo/patches/patch-src_IO_dpi_c b/www/dillo/patches/patch-src_IO_dpi_c
index d98d706ffff..8b7fad96550 100644
--- a/www/dillo/patches/patch-src_IO_dpi_c
+++ b/www/dillo/patches/patch-src_IO_dpi_c
@@ -1,15 +1,15 @@
-$OpenBSD: patch-src_IO_dpi_c,v 1.7 2006/09/22 04:13:19 pvalchev Exp $
---- src/IO/dpi.c.orig	Wed Mar 15 07:50:04 2006
-+++ src/IO/dpi.c	Tue Jun 20 21:20:04 2006
-@@ -330,9 +330,9 @@
+$OpenBSD: patch-src_IO_dpi_c,v 1.8 2008/10/19 08:42:55 ajacoutot Exp $
+--- src/IO/dpi.c.orig	Sat Oct 18 11:09:20 2008
++++ src/IO/dpi.c	Sat Oct 18 11:10:10 2008
+@@ -302,9 +302,9 @@ static int Dpi_start_dpid(void)
        /* This is the child process.  Execute the command. */
-       gchar *path1 = a_Misc_prepend_user_home(".dillo/dpid");
+       char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
        Dpi_close_fd(st_pipe[0]);
 -      if (execl(path1, "dpid", NULL) == -1) {
 +      if (execl(path1, "dpid", (void *)NULL) == -1) {
-          g_free(path1);
+          dFree(path1);
 -         if (execlp("dpid", "dpid", NULL) == -1) {
 +         if (execlp("dpid", "dpid", (void *)NULL) == -1) {
-             DEBUG_MSG(4, "Dpi_start_dpid (child): %s\n", g_strerror(errno));
+             MSG("Dpi_start_dpid (child): %s\n", dStrerror(errno));
              do
                 n = write(st_pipe[1], "ERROR", 5);
diff --git a/www/dillo/patches/patch-src_IO_http_c b/www/dillo/patches/patch-src_IO_http_c
index 72c1fc3f2a6..62a5d8af091 100644
--- a/www/dillo/patches/patch-src_IO_http_c
+++ b/www/dillo/patches/patch-src_IO_http_c
@@ -1,19 +1,125 @@
-$OpenBSD: patch-src_IO_http_c,v 1.9 2004/12/04 20:44:27 couderc Exp $
---- src/IO/http.c.orig	Wed Oct  6 19:09:44 2004
-+++ src/IO/http.c	Sat Dec  4 19:28:46 2004
-@@ -316,6 +316,7 @@ static int Http_connect_socket(ChainLink
-       struct sockaddr_in *sin = (struct sockaddr_in *)&name;
-       socket_len = sizeof(struct sockaddr_in);
-       sin->sin_family = dh->af;
-+      sin->sin_len = socket_len;
-       sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
-       memcpy(&sin->sin_addr, dh->data, dh->alen);
-       if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-@@ -330,6 +331,7 @@ static int Http_connect_socket(ChainLink
-       socket_len = sizeof(struct sockaddr_in6);
-       sin6->sin6_family = dh->af;
-       sin6->sin6_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
-+      sin6->sin6_len = socket_len;
-       memcpy(&sin6->sin6_addr, dh->data, dh->alen);
-       inet_ntop(dh->af, dh->data, buf, sizeof(buf));
-       if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
+$OpenBSD: patch-src_IO_http_c,v 1.10 2008/10/19 08:42:55 ajacoutot Exp $
+--- src/IO/http.c.orig	Sun Sep 28 14:57:42 2008
++++ src/IO/http.c	Sat Oct 18 22:26:06 2008
+@@ -311,7 +311,7 @@ static void Http_send_query(ChainLink *Info, SocketDat
+  */
+ static int Http_connect_socket(ChainLink *Info)
+ {
+-   int status;
++   int i, status;
+ #ifdef ENABLE_IPV6
+    struct sockaddr_in6 name;
+ #else
+@@ -324,61 +324,63 @@ static int Http_connect_socket(ChainLink *Info)
+    S = a_Klist_get_data(ValidSocks, VOIDP2INT(Info->LocalKey));
+ 
+    /* TODO: iterate this address list until success, or end-of-list */
+-   dh = dList_nth_data(S->addr_list, 0);
++   for (i = 0; (dh = dList_nth_data(S->addr_list, i)); ++i) {
++      if ((S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0) {
++         S->Err = errno;
++         MSG("Http_connect_socket ERROR: %s\n", dStrerror(errno));
++         continue;
++      }
++      /* set NONBLOCKING and close on exec. */
++      fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
++      fcntl(S->SockFD, F_SETFD, FD_CLOEXEC | fcntl(S->SockFD, F_GETFD));
+ 
+-   if ((S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0) {
+-      S->Err = errno;
+-      MSG("Http_connect_socket ERROR: %s\n", dStrerror(errno));
+-      return -1;
+-   }
+-   /* set NONBLOCKING and close on exec. */
+-   fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
+-   fcntl(S->SockFD, F_SETFD, FD_CLOEXEC | fcntl(S->SockFD, F_GETFD));
+-
+-   /* Some OSes require this...  */
+-   memset(&name, 0, sizeof(name));
+-   /* Set remaining parms. */
+-   switch (dh->af) {
+-   case AF_INET:
+-   {
+-      struct sockaddr_in *sin = (struct sockaddr_in *)&name;
+-      socket_len = sizeof(struct sockaddr_in);
+-      sin->sin_family = dh->af;
+-      sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
+-      memcpy(&sin->sin_addr, dh->data, (size_t)dh->alen);
+-      if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
+-         MSG("Connecting to %s\n", inet_ntoa(sin->sin_addr));
+-      break;
+-   }
++      /* Some OSes require this...  */
++      memset(&name, 0, sizeof(name));
++      /* Set remaining parms. */
++      switch (dh->af) {
++      case AF_INET:
++      {
++         struct sockaddr_in *sin = (struct sockaddr_in *)&name;
++         socket_len = sizeof(struct sockaddr_in);
++         sin->sin_family = dh->af;
++         sin->sin_len = socket_len;
++         sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
++         memcpy(&sin->sin_addr, dh->data, (size_t)dh->alen);
++         if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
++            MSG("Connecting to %s\n", inet_ntoa(sin->sin_addr));
++         break;
++      }
+ #ifdef ENABLE_IPV6
+-   case AF_INET6:
+-   {
+-      char buf[128];
+-      struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
+-      socket_len = sizeof(struct sockaddr_in6);
+-      sin6->sin6_family = dh->af;
+-      sin6->sin6_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
+-      memcpy(&sin6->sin6_addr, dh->data, dh->alen);
+-      inet_ntop(dh->af, dh->data, buf, sizeof(buf));
+-      if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
+-         MSG("Connecting to %s\n", buf);
+-      break;
+-   }
++      case AF_INET6:
++      {
++         char buf[128];
++         struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
++         socket_len = sizeof(struct sockaddr_in6);
++         sin6->sin6_family = dh->af;
++         sin6->sin6_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
++         sin6->sin6_len = socket_len;
++         memcpy(&sin6->sin6_addr, dh->data, dh->alen);
++         inet_ntop(dh->af, dh->data, buf, sizeof(buf));
++         if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
++            MSG("Connecting to %s\n", buf);
++         break;
++      }
+ #endif
+-   }/*switch*/
++      }/*switch*/
+ 
+-   MSG_BW(S->web, 1, "Contacting host...");
+-   status = connect(S->SockFD, (struct sockaddr *)&name, socket_len);
+-   if (status == -1 && errno != EINPROGRESS) {
+-      S->Err = errno;
+-      Http_socket_close(S);
+-      MSG("Http_connect_socket ERROR: %s\n", dStrerror(S->Err));
+-      return -1;
+-   } else {
+-      Http_send_query(S->Info, S);
++      MSG_BW(S->web, 1, "Contacting host...");
++      status = connect(S->SockFD, (struct sockaddr *)&name, socket_len);
++      if (status == -1 && errno != EINPROGRESS) {
++         S->Err = errno;
++         Http_socket_close(S);
++         MSG("Http_connect_socket ERROR: %s\n", dStrerror(S->Err));
++      } else {
++         Http_send_query(S->Info, S);
++         return 0; /* Success */
++      }
+    }
+ 
+-   return 0; /* Success */
++   return -1;
+ }
+ 
+ /*
diff --git a/www/dillo/patches/patch-src_cookies_c b/www/dillo/patches/patch-src_cookies_c
index 6753b110f35..7ffad98c40b 100644
--- a/www/dillo/patches/patch-src_cookies_c
+++ b/www/dillo/patches/patch-src_cookies_c
@@ -1,28 +1,13 @@
-$OpenBSD: patch-src_cookies_c,v 1.5 2006/09/22 04:13:19 pvalchev Exp $
---- src/cookies.c.orig	Wed Mar 29 10:48:13 2006
-+++ src/cookies.c	Sun Jul  2 18:00:44 2006
-@@ -15,7 +15,6 @@
-  * http://www.cis.ohio-state.edu/cs/Services/rfc/rfc-text/rfc2965.txt
-  */
+$OpenBSD: patch-src_cookies_c,v 1.6 2008/10/19 08:42:55 ajacoutot Exp $
+--- src/cookies.c.orig	Sat Oct 18 11:12:23 2008
++++ src/cookies.c	Sat Oct 18 11:12:44 2008
+@@ -92,6 +92,9 @@ static FILE *Cookies_fopen(const char *filename, char 
  
--#define DEBUG_LEVEL 10
- #include "debug.h"
- 
- 
-@@ -97,13 +96,13 @@ static FILE *Cookies_fopen(const char *f
- 
-          DEBUG_MSG(10, "Cookies: Created file: %s\n", filename);
-          F_in = Cookies_fopen(filename, NULL);
+          MSG("Cookies: Created file: %s\n", filename);
+          F_in = fopen(filename, "r");
 +
-+	 /* set close on exec */
-+	 fcntl(fileno(F_in), F_SETFD, FD_CLOEXEC | fcntl(fileno(F_in), F_GETFD));
++         /* set close on exec */
++         fcntl(fileno(F_in), F_SETFD, FD_CLOEXEC | fcntl(fileno(F_in), F_GETFD));
        } else {
-          DEBUG_MSG(10, "Cookies: Could not create file: %s!\n", filename);
+          MSG("Cookies: Could not create file: %s!\n", filename);
        }
-    }
--
--   /* set close on exec */
--   fcntl(fileno(F_in), F_SETFD, FD_CLOEXEC | fcntl(fileno(F_in), F_GETFD));
- 
-    return F_in;
- }
diff --git a/www/dillo/patches/patch-src_dillo_c b/www/dillo/patches/patch-src_dillo_c
deleted file mode 100644
index f95b56b09de..00000000000
--- a/www/dillo/patches/patch-src_dillo_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_dillo_c,v 1.7 2006/09/22 04:13:19 pvalchev Exp $
---- src/dillo.c.orig	Mon Jan  2 10:20:08 2006
-+++ src/dillo.c	Tue Jun 20 21:11:50 2006
-@@ -49,6 +49,7 @@
- #include "interface.h"
- #include "dw.h"
- #include "cookies.h"
-+#include "debug.h"
- 
- 
- /*
diff --git a/www/dillo/patches/patch-src_dns_c b/www/dillo/patches/patch-src_dns_c
index 4efd2cf4e49..cc4f2b47daf 100644
--- a/www/dillo/patches/patch-src_dns_c
+++ b/www/dillo/patches/patch-src_dns_c
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_dns_c,v 1.9 2006/09/22 04:13:19 pvalchev Exp $
---- src/dns.c.orig	Wed Mar 15 09:01:00 2006
-+++ src/dns.c	Tue Jun 20 21:14:46 2006
-@@ -38,7 +38,7 @@
+$OpenBSD: patch-src_dns_c,v 1.10 2008/10/19 08:42:55 ajacoutot Exp $
+--- src/dns.c.orig	Sat Oct  4 20:52:30 2008
++++ src/dns.c	Sat Oct 18 11:14:19 2008
+@@ -34,7 +34,7 @@
  /*
   * Uncomment the following line for debugging or gprof profiling.
   */
 -/* #undef D_DNS_THREADED */
 +#undef D_DNS_THREADED
  
- /*
-  * Uncomment the following line for libc5 optimization
+ 
+ /* Maximum dns resolving threads */
diff --git a/www/dillo/pkg/DESCR b/www/dillo/pkg/DESCR
index 710c5f12a7b..b71f2300bbd 100644
--- a/www/dillo/pkg/DESCR
+++ b/www/dillo/pkg/DESCR
@@ -1,4 +1,2 @@
-Dillo is a graphical web browser that's completely written in C,
-very fast, small in code and binary. It basically depends on GTK+,
-and renders a good subset of HTML, frames are managed same as lynx,
-no jvm, no javascript.
+Dillo is a multi-platform graphical web browser known for its speed and
+small size. It is written in C and C++ and based on FLTK2.
diff --git a/www/dillo/pkg/PLIST b/www/dillo/pkg/PLIST
index 40b816cea32..dc35be521c1 100644
--- a/www/dillo/pkg/PLIST
+++ b/www/dillo/pkg/PLIST
@@ -1,25 +1,37 @@
-@comment $OpenBSD: PLIST,v 1.8 2006/09/22 04:13:19 pvalchev Exp $
-bin/dillo
-bin/dpid
+@comment $OpenBSD: PLIST,v 1.9 2008/10/19 08:42:55 ajacoutot Exp $
+@bin bin/dillo
+@bin bin/dpid
 bin/dpidc
 lib/dillo/
 lib/dillo/dpi/
 lib/dillo/dpi/bookmarks/
-lib/dillo/dpi/bookmarks/bookmarks.dpi
+@bin lib/dillo/dpi/bookmarks/bookmarks.dpi
 lib/dillo/dpi/cookies/
-lib/dillo/dpi/cookies/cookies.dpi
+@bin lib/dillo/dpi/cookies/cookies.dpi
 lib/dillo/dpi/datauri/
-lib/dillo/dpi/datauri/datauri.filter.dpi
+@bin lib/dillo/dpi/datauri/datauri.filter.dpi
 lib/dillo/dpi/downloads/
-lib/dillo/dpi/downloads/downloads.dpi
+@bin lib/dillo/dpi/downloads/downloads.dpi
 lib/dillo/dpi/file/
-lib/dillo/dpi/file/file.dpi
+@bin lib/dillo/dpi/file/file.dpi
 lib/dillo/dpi/ftp/
-lib/dillo/dpi/ftp/ftp.filter.dpi
+@bin lib/dillo/dpi/ftp/ftp.filter.dpi
 lib/dillo/dpi/hello/
-lib/dillo/dpi/hello/hello.filter.dpi
+@bin lib/dillo/dpi/hello/hello.filter.dpi
 lib/dillo/dpi/https/
-lib/dillo/dpi/https/https.filter.dpi
+@bin lib/dillo/dpi/https/https.filter.dpi
+share/doc/dillo/
+share/doc/dillo/Cache.txt
+share/doc/dillo/Cookies.txt
+share/doc/dillo/Dillo.txt
+share/doc/dillo/Dpid.txt
+share/doc/dillo/Dw.txt
+share/doc/dillo/HtmlParser.txt
+share/doc/dillo/IO.txt
+share/doc/dillo/Images.txt
+share/doc/dillo/Imgbuf.txt
+share/doc/dillo/NC_design.txt
+share/doc/dillo/Selection.txt
 share/examples/dillo/
 share/examples/dillo/dillorc
 @sample ${SYSCONFDIR}/dillorc