diff --git a/agg.spec b/agg.spec
index 5ad1337..d1eb696 100644
--- a/agg.spec
+++ b/agg.spec
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry graphical rendering engine
 Name:    agg
 Version: 2.5
-Release: 16%{?dist}
+Release: 17%{?dist}
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: GPLv2+
@@ -21,6 +21,18 @@ Patch0: agg-2.4-depends.patch
 Patch1: agg-2.5-pkgconfig.patch
 Patch2: agg-2.5-autotools.patch
 
+Patch101: 0001-Fix-non-terminating-loop-conditions-when-len-1.patch
+Patch102: 0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
+Patch103: 0003-Get-coordinates-from-previous-vertex-if-last-command.patch
+Patch104: 0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
+Patch105: 0005-Remove-VC-6-workaround.patch
+Patch106: 0006-Implement-grain-merge-blending-mode-GIMP.patch
+Patch107: 0007-Implement-grain-extract-blending-mode-GIMP.patch
+Patch108: 0008-Declare-multiplication-and-division-operators-as-con.patch
+Patch109: 0009-Add-a-static-identity-transformation.patch
+Patch110: 0010-Add-renderer_scanline_aa_alpha.patch
+Patch111: 0011-Avoid-division-by-zero-in-color-burn-mode.patch
+
 %description
 A High Quality Rendering Engine for C++.
 
@@ -40,6 +52,17 @@ using agg.
 %patch0 -p1 -b .depends
 %patch1 -p1 -b .pkgconfig
 %patch2 -p0 -b .autotools
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
+%patch110 -p1
+%patch111 -p1
 aclocal
 autoheader
 autoconf
@@ -85,6 +108,9 @@ mv __clean_examples __dist_examples/examples
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sun May 19 2013 Tom Hughes <tom@compton.nu> - 2.5-17
+- Add patches from mapnik
+
 * Fri Feb 22 2013 Jon Ciesla <limburgher@gmail.com> - 2.5-16
 - Fix FTBFS, BZ 913873.