diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 2b826a739911..0f9c4a00c698 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -1,49 +1,63 @@
 PORTNAME=	gdome2
 PORTVERSION=	0.8.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	textproc
 MASTER_SITES=	http://gdome2.cs.unibo.it/tarball/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Gnome DOM Engine
 WWW=		http://gdome2.cs.unibo.it/
 
-USES=		gnome libtool pathfix pkgconfig
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	dual
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
+
+USES=		gnome libtool localbase pathfix pkgconfig
 USE_GNOME=	glib20 libxml2
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0"
+
+INSTALL_TARGET=	install-strip
+
 CFLAGS+=	-fcommon
-CPPFLAGS+=	-I${LOCALBASE}/include
+
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
+
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	*
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -and \
 		'(' -name '*.[ch]' -or -name '*.xml' ')' | \
 		${XARGS} ${REINPLACE_CMD} -e ' \
 		 s,<parser\.h>,<libxml/parser.h>,; \
 		 s,<hash\.h>,<libxml/hash.h>,; \
 		 s,<xmlmemory\.h>,<libxml/xmlmemory.h>,; \
 		 s,<tree\.h>,<libxml/tree.h>,; \
 		 s,<xmlerror\.h>,<libxml/xmlerror.h>,; \
 		 s,<xmlIO\.h>,<libxml/xmlIO.h>,; \
 		 s,<parserInternals\.h>,<libxml/parserInternals.h>,; \
 		 s,<entities\.h>,<libxml/entities.h>,'
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -E -e \
 		's,^(HTML_DIR *= *).*,\1\$$(DESTDIR)$$(prefix)/share/doc,' \
 		${WRKSRC}/gtk-doc/Makefile.in
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/gtk-doc/d' ${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdome.so
 
 .include <bsd.port.mk>
diff --git a/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c b/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c
index 5b94efe8ecca..9a89320c8069 100644
--- a/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c
+++ b/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c
@@ -1,20 +1,20 @@
 Patch from Gentoo to fix libxml2 2.9 api change
 
 Patch by Harris Landgarten.
 
 The patch was submitted on bug 448236, following the announcement on
 https://mail.gnome.org/archives/xml/2012-August/msg00005.html
---- libgdome/gdomecore/gdome-xml-documentt.c.orig	2003-07-13 06:47:54.000000000 -0400
-+++ libgdome/gdomecore/gdome-xml-documentt.c	2012-12-23 08:57:23.000000000 -0500
-@@ -342,7 +342,11 @@
+--- libgdome/gdomecore/gdome-xml-documentt.c.orig	2003-07-13 10:47:54 UTC
++++ libgdome/gdomecore/gdome-xml-documentt.c
+@@ -342,7 +342,11 @@ gdome_xml_dt_internalSubset (GdomeDocumentType *self, 
  	}
  	xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL);
  	xmlOutputBufferFlush(out_buff);
 +#if LIBXML_VERSION < 20900
  	ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use);
 +#else
 +	ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer));
 +#endif
  	(void)xmlOutputBufferClose(out_buff);
  
  	return gdome_xml_str_mkref_own (ret);