diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index 24eb07ef4d06..910ce22b8034 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -1,54 +1,52 @@
 PORTNAME=	rawstudio
 PORTVERSION=	2.0
 PORTREVISION=	27
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawstudio.org/files/release/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Open-source program to read and manipulate RAW photo images
 WWW=		https://rawstudio.org/
 
 LICENSE=	GPLv2+
 
-BROKEN=		Fails to build with libxml2 2.13+, error: use of undeclared identifier 'xmlDocPtr'
-
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		liblcms.so:graphics/lcms \
 		libexiv2.so:graphics/exiv2 \
 		libdbus-1.so:devel/dbus \
 		libfftw3f.so:math/fftw3-float \
 		libflickcurl.so:www/flickcurl \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgphoto2.so:graphics/libgphoto2 \
 		libharfbuzz.so:print/harfbuzz \
 		liblensfun.so:graphics/lensfun \
 		libpng.so:graphics/png \
 		libraptor2.so:textproc/raptor2 \
 		libtiff.so:graphics/tiff
 
 USES=		compiler:c++11-lang cpe desktop-file-utils gmake gnome \
 		jpeg libtool localbase pathfix pkgconfig sqlite xorg
 USE_GNOME=	cairo gconf2 gdkpixbuf gtk20 libxml2
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 CXXFLAGS+=	-Wno-c++11-narrowing
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^pkg_modules=/s,libssl,gthread-2.0,' \
 		${WRKSRC}/configure
 # lensfun 0.3.0 had removed support for LF_MODIFY_CCI
 	@${REINPLACE_CMD} -e 's, | LF_MODIFY_CCI,,' \
 		${WRKSRC}/plugins/lensfun/lensfun.c
 
 .include <bsd.port.mk>
diff --git a/graphics/rawstudio/files/patch-libxml2-2.12.7 b/graphics/rawstudio/files/patch-libxml2-2.12.7
index 39256d3688a5..6a6d8861d262 100644
--- a/graphics/rawstudio/files/patch-libxml2-2.12.7
+++ b/graphics/rawstudio/files/patch-libxml2-2.12.7
@@ -1,100 +1,120 @@
 --- librawstudio/rs-curve.c
 +++ librawstudio/rs-curve.c
 @@ -21,6 +21,7 @@
  #include <rawstudio.h>
  #include <math.h>
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include <string.h> /* memset() */
  
 --- librawstudio/rs-lens-db.c
 +++ librawstudio/rs-lens-db.c
 @@ -19,6 +19,7 @@
  
  #include <rawstudio.h>
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include "config.h"
  #include "rs-lens-db.h"
 --- librawstudio/rs-lens-fix.c
 +++ librawstudio/rs-lens-fix.c
 @@ -19,6 +19,7 @@
  
  #include <rawstudio.h>
  #include <libxml/encoding.h>
 +#include <libxml/tree.h>
  #include "config.h"
  
  static GHashTable *lens_fix_hash_table;
 --- librawstudio/rs-library.c
 +++ librawstudio/rs-library.c
 @@ -60,6 +60,7 @@
  #include "gettext.h"
  #include "rs-debug.h"
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include <sqlite3.h>
  
 --- librawstudio/rs-metadata.c
 +++ librawstudio/rs-metadata.c
 @@ -21,6 +21,7 @@
  #include <glib/gstdio.h> /* g_unlink() */
  #include <config.h>
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include "gettext.h"
  
 --- librawstudio/rs-profile-camera.c
 +++ librawstudio/rs-profile-camera.c
 @@ -20,6 +20,7 @@
  #include <glib-2.0/glib.h>
  #include "config.h"
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include "rs-utils.h"
  
+--- plugins/output-facebook/rs-facebook-client.c
++++ plugins/output-facebook/rs-facebook-client.c
+@@ -19,6 +19,7 @@
+ 
+ #include <curl/curl.h>
+ #include <libxml/encoding.h>
++#include <libxml/tree.h>
+ #include <gtk/gtk.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+--- plugins/output-picasa/rs-picasa-client.c
++++ plugins/output-picasa/rs-picasa-client.c
+@@ -10,6 +10,7 @@
+ #include <glib.h>
+ #include <gtk/gtk.h>
+ #include <libxml/encoding.h>
++#include <libxml/tree.h>
+ #include <string.h>
+ #include <curl/curl.h>
+ #include "rs-picasa-client.h"
 --- src/rs-batch.c
 +++ src/rs-batch.c
 @@ -23,6 +23,7 @@
  #include <gtk/gtk.h>
  #include <config.h>
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include "application.h"
  #include "rs-batch.h"
 --- src/rs-cache.c
 +++ src/rs-cache.c
 @@ -20,6 +20,7 @@
  #include <rawstudio.h>
  #include <glib.h>
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include "application.h"
  #include "rs-cache.h"
 --- src/rs-camera-db.c
 +++ src/rs-camera-db.c
 @@ -20,6 +20,7 @@
  #include "config.h"
  #include "gettext.h"
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include "rs-camera-db.h"
  #include "rs-photo.h"
 --- src/rs-store.c
 +++ src/rs-store.c
 @@ -22,6 +22,7 @@
  #include <glib/gprintf.h>
  #include <config.h>
  #include <libxml/encoding.h>
 +#include <libxml/parser.h>
  #include <libxml/xmlwriter.h>
  #include <glib.h>
  #include <math.h>