diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 366dd1a48e9..ae29375128a 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.42 2013/03/11 11:44:41 espie Exp $
+# $OpenBSD: Makefile,v 1.43 2013/04/19 14:33:51 bcallah Exp $
 
 COMMENT =		fast and light graphical web browser
 
-DISTNAME =		dillo-3.0.2
+DISTNAME =		dillo-3.0.3
 CATEGORIES =		www
 
 MAINTAINER =		Brian Callahan <bcallah@openbsd.org>
 HOMEPAGE =		http://www.dillo.org/
-REVISION =		1
 
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
@@ -18,7 +17,7 @@ WANTLIB += stdc++ z jpeg>=62 png>=2
 
 MODULES =	converters/libiconv
 
-MASTER_SITES =	${HOMEPAGE}download/
+MASTER_SITES =	http://www.dillo.org/download/
 
 EXTRACT_SUFX =	.tar.bz2
 
@@ -38,6 +37,8 @@ CONFIGURE_ARGS =	--enable-ipv6 \
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+FAKE_FLAGS =		sysconfdir=${PREFIX}/share/examples/dillo/
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/dillo
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 9f928e1e80e..b21e774ea90 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dillo-3.0.2.tar.bz2) = tPLNfBvp8J5wX2jAlYE+pbudcocDOPw2xh1ofgQpUNY=
-SIZE (dillo-3.0.2.tar.bz2) = 640894
+SHA256 (dillo-3.0.3.tar.bz2) = SCQcqW1ML0v4Pr60DHQcmQ+rDWsPe5dmpkI05IEAjdI=
+SIZE (dillo-3.0.3.tar.bz2) = 685824
diff --git a/www/dillo/patches/patch-Makefile_in b/www/dillo/patches/patch-Makefile_in
deleted file mode 100644
index 9e72f9e2444..00000000000
--- a/www/dillo/patches/patch-Makefile_in
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2010/03/01 14:53:34 benoit Exp $
---- Makefile.in.orig	Thu Feb 11 11:20:01 2010
-+++ Makefile.in	Tue Feb 23 10:28:08 2010
-@@ -302,7 +302,7 @@
- 	-rm -f config.h stamp-h1
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+	$(mkdir_p) $(PREFIX)/share/examples/dillo/
- 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -310,7 +310,7 @@
- 	done | $(am__base_list) | \
- 	while read files; do \
- 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  $(INSTALL_DATA) $$files "$(PREFIX)/share/examples/dillo/"; \
- 	done
- 
- uninstall-sysconfDATA:
diff --git a/www/dillo/patches/patch-dillorc b/www/dillo/patches/patch-dillorc
index 13ecae6867a..15919b99ddd 100644
--- a/www/dillo/patches/patch-dillorc
+++ b/www/dillo/patches/patch-dillorc
@@ -1,6 +1,6 @@
---- dillorc.orig	Fri Jan  4 19:53:22 2013
-+++ dillorc	Fri Jan  4 19:53:37 2013
-@@ -53,7 +53,7 @@
+--- dillorc.orig	Thu Apr  4 13:20:10 2013
++++ dillorc	Thu Apr 18 12:25:04 2013
+@@ -46,7 +46,7 @@
  # "fc-list : family | cut -d ',' -f 2 | sort").
  #font_serif="DejaVu Serif"
  #font_sans_serif="DejaVu Sans"
diff --git a/www/dillo/patches/patch-dpi_datauri_c b/www/dillo/patches/patch-dpi_datauri_c
index 5bfb24d13aa..02747b8bb27 100644
--- a/www/dillo/patches/patch-dpi_datauri_c
+++ b/www/dillo/patches/patch-dpi_datauri_c
@@ -1,7 +1,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)
+$OpenBSD: patch-dpi_datauri_c,v 1.3 2013/04/19 14:33:51 bcallah Exp $
+--- dpi/datauri.c.orig	Sun Jan 27 12:26:38 2013
++++ dpi/datauri.c	Thu Apr 18 12:25:04 2013
+@@ -324,7 +324,7 @@ int main(void)
     data = datauri_get_data(url, &data_size);
  
     MSG("mime_type: %s\n", mime_type);
diff --git a/www/dillo/patches/patch-dpi_https_c b/www/dillo/patches/patch-dpi_https_c
index bed8c5b860a..bbc68cce4e9 100644
--- a/www/dillo/patches/patch-dpi_https_c
+++ b/www/dillo/patches/patch-dpi_https_c
@@ -1,6 +1,6 @@
---- dpi/https.c.orig	Sun Jun  7 05:40:49 2009
-+++ dpi/https.c	Tue Sep 22 16:03:34 2009
-@@ -159,7 +159,7 @@
+--- dpi/https.c.orig	Sun Jan 27 12:26:38 2013
++++ dpi/https.c	Thu Apr 18 12:25:04 2013
+@@ -165,7 +165,7 @@ static void yes_ssl_support(void)
     /*FIXME - provide for sysconfdir variables and such*/
     if (exit_error == 0){
        if (SSL_CTX_load_verify_locations(
diff --git a/www/dillo/patches/patch-dpid_Makefile_in b/www/dillo/patches/patch-dpid_Makefile_in
deleted file mode 100644
index 991a11e801b..00000000000
--- a/www/dillo/patches/patch-dpid_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-dpid_Makefile_in,v 1.5 2010/03/01 14:53:34 benoit Exp $
---- dpid/Makefile.in.orig	Thu Feb 11 11:20:00 2010
-+++ dpid/Makefile.in	Tue Feb 23 10:30:20 2010
-@@ -440,7 +440,7 @@
- check: check-am
- all-am: Makefile $(PROGRAMS) $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)"; do \
-+	for dir in "$(DESTDIR)$(bindir)" "$(PREFIX)/share/examples/dillo"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
diff --git a/www/dillo/patches/patch-dpid_main_c b/www/dillo/patches/patch-dpid_main_c
index a5ae3395b70..c52916f02b0 100644
--- a/www/dillo/patches/patch-dpid_main_c
+++ b/www/dillo/patches/patch-dpid_main_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-dpid_main_c,v 1.4 2010/03/01 14:53:34 benoit Exp $
---- dpid/main.c.orig	Mon Feb  8 11:59:31 2010
-+++ dpid/main.c	Tue Feb 23 10:32:46 2010
-@@ -68,7 +68,7 @@
+$OpenBSD: patch-dpid_main_c,v 1.5 2013/04/19 14:33:51 bcallah Exp $
+--- dpid/main.c.orig	Sun Jan 27 12:26:38 2013
++++ dpid/main.c	Thu Apr 18 12:25:04 2013
+@@ -70,7 +70,7 @@ static int start_filter_plugin(struct dp dpi_attr)
     }
     if (pid == 0) {
        /* Child, start plugin */
@@ -10,7 +10,7 @@ $OpenBSD: patch-dpid_main_c,v 1.4 2010/03/01 14:53:34 benoit Exp $
           ERRMSG("start_plugin", "execl", errno);
           MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
           exit(1);
-@@ -100,7 +100,7 @@
+@@ -102,7 +102,7 @@ static void start_server_plugin(struct dp dpi_attr)
        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
deleted file mode 100644
index 32f4355f4aa..00000000000
--- a/www/dillo/patches/patch-src_IO_dpi_c
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_IO_dpi_c,v 1.9 2010/03/01 14:53:34 benoit Exp $
---- src/IO/dpi.c.orig	Thu Feb  4 23:09:33 2010
-+++ src/IO/dpi.c	Tue Feb 23 10:41:48 2010
-@@ -363,12 +363,12 @@
-       /* This is the child process.  Execute the command. */
-       char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
-       Dpi_close_fd(st_pipe[0]);
--      if (execl(path1, "dpid", (char*)NULL) == -1) {
-+      if (execl(path1, "dpid", (void *)NULL) == -1) {
-          dFree(path1);
-          path1 = dStrconcat(DILLO_BINDIR, "dpid", NULL);
--         if (execl(path1, "dpid", (char*)NULL) == -1) {
-+         if (execl(path1, "dpid", (void *)NULL) == -1) {
-             dFree(path1);
--            if (execlp("dpid", "dpid", (char*)NULL) == -1) {
-+            if (execlp("dpid", "dpid", (void *)NULL) == -1) {
-                MSG("Dpi_start_dpid (child): %s\n", dStrerror(errno));
-                if (Dpi_blocking_write(st_pipe[1], "ERROR", 5) == -1) {
-                   MSG("Dpi_start_dpid (child): can't write to pipe.\n");
diff --git a/www/dillo/patches/patch-src_Makefile_in b/www/dillo/patches/patch-src_Makefile_in
deleted file mode 100644
index 5b03ad99103..00000000000
--- a/www/dillo/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2010/03/01 14:53:34 benoit Exp $
---- src/Makefile.in.orig	Thu Feb 11 11:20:01 2010
-+++ src/Makefile.in	Tue Feb 23 10:39:12 2010
-@@ -527,15 +527,15 @@
- @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(PREFIX)/share/examples/dillo" || $(mkdir_p) "$(PREFIX)/share/examples/dillo"
- 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
- 	done | $(am__base_list) | \
- 	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(PREFIX)/share/examples/dillo/'"; \
-+	  $(INSTALL_DATA) $$files "$(PREFIX)/share/examples/dillo/" || exit $$?; \
- 	done
- 
- uninstall-sysconfDATA:
diff --git a/www/dillo/patches/patch-src_cookies_c b/www/dillo/patches/patch-src_cookies_c
index 7ffad98c40b..702e8f00830 100644
--- a/www/dillo/patches/patch-src_cookies_c
+++ b/www/dillo/patches/patch-src_cookies_c
@@ -1,7 +1,7 @@
-$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 
+$OpenBSD: patch-src_cookies_c,v 1.7 2013/04/19 14:33:51 bcallah Exp $
+--- src/cookies.c.orig	Sun Jan 27 12:26:38 2013
++++ src/cookies.c	Thu Apr 18 12:25:04 2013
+@@ -94,6 +94,9 @@ static FILE *Cookies_fopen(const char *filename, char 
  
           MSG("Cookies: Created file: %s\n", filename);
           F_in = fopen(filename, "r");
diff --git a/www/dillo/patches/patch-src_dns_c b/www/dillo/patches/patch-src_dns_c
deleted file mode 100644
index cc4f2b47daf..00000000000
--- a/www/dillo/patches/patch-src_dns_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
- 
- 
- /* Maximum dns resolving threads */
diff --git a/www/dillo/pkg/PLIST b/www/dillo/pkg/PLIST
index 9939f474d80..eef33cad649 100644
--- a/www/dillo/pkg/PLIST
+++ b/www/dillo/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.12 2013/01/05 22:42:58 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.13 2013/04/19 14:33:51 bcallah Exp $
 @bin bin/dillo
+bin/dillo-install-hyphenation
 @bin bin/dpid
 @bin bin/dpidc
 lib/dillo/
@@ -37,8 +38,12 @@ share/doc/dillo/NC_design.txt
 share/doc/dillo/Selection.txt
 share/doc/dillo/user_help.html
 share/examples/dillo/
+@sample ${SYSCONFDIR}/dillo/
 share/examples/dillo/dillorc
-@sample ${SYSCONFDIR}/dillorc
+@sample ${SYSCONFDIR}/dillo/dillorc
+share/examples/dillo/domainrc
+@sample ${SYSCONFDIR}/dillo/domainrc
 share/examples/dillo/dpidrc
-@sample ${SYSCONFDIR}/dpidrc
+@sample ${SYSCONFDIR}/dillo/dpidrc
 share/examples/dillo/keysrc
+@sample ${SYSCONFDIR}/dillo/keysrc