diff --git a/www/larbin/Makefile b/www/larbin/Makefile
index 782111cbff0f..941d6ffbe1ad 100644
--- a/www/larbin/Makefile
+++ b/www/larbin/Makefile
@@ -1,73 +1,70 @@
 # Created by: Hiten Pandya <hiten@uk.FreeBSD.org>
 
 PORTNAME=	larbin
 PORTVERSION=	2.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP crawler with an easy interface
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: data
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: data
-
 BUILD_DEPENDS=	bash:shells/bash \
 		makedepend:devel/makedepend
 
 USES=		gmake shebangfix
 SHEBANG_FILES=	configure
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 
 PORTDOCS=	*
 PLIST_FILES=	bin/larbin etc/larbin.conf.sample
 
 OPTIONS_DEFINE=	DOCS
 
 pre-everything::
 	@${ECHO_MSG} "====================================================================="
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Make sure you have a look at the larbin documentation available at:"
 	@${ECHO_MSG} "  http://larbin.sourceforge.net/custom-eng.html."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "====================================================================="
 
 post-extract:
 	@(cd ${WRKSRC}/src/utils && ${MV} string.h mystring.h)
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/CC=/s|echo|${TRUE:T}| ; \
 		 /CXX=/s|echo|${TRUE:T}| ; \
 		 /-lpthread/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|CFLAGS:=-O3|CFLAGS+=| ; \
 		 s|CXXFLAGS:=|CXXFLAGS+=| ; \
 		 s|-O3|| ; \
 		 s|-I-||' ${WRKSRC}/src/larbin.make
 	@${REINPLACE_CMD} -e \
 		'/delete \[\] tab/s|^|//|' ${WRKSRC}/src/utils/histogram.cc
 	@${FIND} ${WRKSRC}/src -name "*.cc" -or -name "*.h" | ${XARGS} \
 		${REINPLACE_CMD} -e \
 		's|utils/string.h|utils/mystring.h| ; \
 		 s|<iostream.h>|<iostream>| ; \
 		 s|<string.h>|<cstring>| ; \
 		 s|\([[:blank:]]\)cerr|\1std::cerr|g ; \
 		 s|\([[:blank:]]\)cout|\1std::cout|g ; \
 		 s|\([[:blank:]]\)endl|\1std::endl|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/larbin ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/larbin.conf ${STAGEDIR}${PREFIX}/etc/larbin.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/larbin/files/patch-adns_internal.h b/www/larbin/files/patch-adns_internal.h
index 41b65d5074b4..a8d7cf8f7525 100644
--- a/www/larbin/files/patch-adns_internal.h
+++ b/www/larbin/files/patch-adns_internal.h
@@ -1,11 +1,31 @@
 --- adns/internal.h.orig	2002-01-02 10:44:52 UTC
 +++ adns/internal.h
-@@ -567,7 +567,7 @@ typedef enum {
+@@ -151,15 +151,17 @@ typedef struct allocnode {
+   struct allocnode *next, *back;
+ } allocnode;
+ 
+-union maxalign {
++typedef union maxalign {
+   byte d[1];
+   struct in_addr ia;
+   long l;
+   void *p;
+   void (*fp)(void);
+   union maxalign *up;
+-} data;
++} data_t;
+ 
++extern data_t data;
++
+ typedef struct {
+   void *ext;
+   void (*callback)(adns_query parent, adns_query child);
+@@ -567,7 +569,7 @@ typedef enum {
  } parsedomain_flags;
  
  adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
 -			       vbuf *vb, parsedomain_flags flags,
 +			       vbuf *vb, adns_queryflags flags,
  			       const byte *dgram, int dglen, int *cbyte_io, int max);
  /* vb must already have been initialised; it will be reset if necessary.
   * If there is truncation, vb->used will be set to 0; otherwise