diff --git a/srcpkgs/raptor/patches/CVE-2017-18926.patch b/srcpkgs/raptor/patches/CVE-2017-18926.patch
new file mode 100644
index 0000000000..64b051418b
--- /dev/null
+++ b/srcpkgs/raptor/patches/CVE-2017-18926.patch
@@ -0,0 +1,40 @@
+From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
+From: Dave Beckett <dave@dajobe.org>
+Date: Sun, 16 Apr 2017 23:15:12 +0100
+Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer
+
+(raptor_xml_writer_start_element_common): Calculate max including for
+each attribute a potential name and value.
+
+Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617
+and #0000618 http://bugs.librdf.org/mantis/view.php?id=618
+---
+ src/raptor_xml_writer.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
+index 693b9468..0d3a36a5 100644
+--- src/raptor_xml_writer.c
++++ src/raptor_xml_writer.c
+@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+   size_t nspace_declarations_count = 0;  
+   unsigned int i;
+ 
+-  /* max is 1 per element and 1 for each attribute + size of declared */
+   if(nstack) {
+-    int nspace_max_count = element->attribute_count+1;
++    int nspace_max_count = element->attribute_count * 2; /* attr and value */
++    if(element->name->nspace)
++      nspace_max_count++;
+     if(element->declared_nspaces)
+       nspace_max_count += raptor_sequence_size(element->declared_nspaces);
+     if(element->xml_language)
+@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+         }
+       }
+ 
+-      /* Add the attribute + value */
++      /* Add the attribute's value */
+       nspace_declarations[nspace_declarations_count].declaration=
+         raptor_qname_format_as_xml(element->attributes[i],
+                                    &nspace_declarations[nspace_declarations_count].length);
diff --git a/srcpkgs/raptor/patches/out-of-bounds.patch b/srcpkgs/raptor/patches/out-of-bounds.patch
new file mode 100644
index 0000000000..08b1b0d37b
--- /dev/null
+++ b/srcpkgs/raptor/patches/out-of-bounds.patch
@@ -0,0 +1,16 @@
+Patch from https://bugs.librdf.org/mantis/view.php?id=650
+
+diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
+index 56993dc3..163f34d5 100644
+--- src/raptor_xml_writer.c
++++ src/raptor_xml_writer.c
+@@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+ 
+   if(nstack && element->attributes) {
+     for(i = 0; i < element->attribute_count; i++) {
++      if (nspace_declarations_count > element->attribute_count)
++        goto error;
++
+       /* qname */
+       if(element->attributes[i]->nspace) {
+         /* Check if we need a namespace declaration attribute */
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 477df6a9a0..5408f6b745 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -1,7 +1,7 @@
 # Template file for 'raptor'
 pkgname=raptor
 version=2.0.15
-revision=2
+revision=3
 wrksrc="raptor2-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --with-yajl=no"