diff -Nru munin-2.0.25/debian/changelog munin-2.0.25/debian/changelog
--- munin-2.0.25/debian/changelog	2014-11-27 20:54:22.000000000 +0100
+++ munin-2.0.25/debian/changelog	2017-02-23 06:34:19.000000000 +0100
@@ -1,3 +1,11 @@
+munin (2.0.25-1+deb8u1) jessie-security; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * CVE-2017-6188: munin-cgi-graph local file write vulnerability
+    (Closes: #855705)
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Thu, 23 Feb 2017 06:34:19 +0100
+
 munin (2.0.25-1) unstable; urgency=medium
 
   * New upstream bugfix release. (Closes: #769415, #770745, #770746, #770826),
diff -Nru munin-2.0.25/debian/patches/0002-CVE-2017-6188.patch munin-2.0.25/debian/patches/0002-CVE-2017-6188.patch
--- munin-2.0.25/debian/patches/0002-CVE-2017-6188.patch	1970-01-01 01:00:00.000000000 +0100
+++ munin-2.0.25/debian/patches/0002-CVE-2017-6188.patch	2017-02-23 06:34:19.000000000 +0100
@@ -0,0 +1,30 @@
+Description: CVE-2017-6188: munin-cgi-graph local file write vulnerability
+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=855705;filename=0002-fix-parameter-injection.patch;msg=5
+Bug: https://github.com/munin-monitoring/munin/issues/721
+Bug-Debian: https://bugs.debian.org/855705
+Forwarded: no
+Author: Tomaž Šolc <tomaz.solc@tablix.org>
+Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2017-02-23
+
+===================================================================
+--- a/master/_bin/munin-cgi-graph.in
++++ b/master/_bin/munin-cgi-graph.in
+@@ -447,13 +447,13 @@ sub draw_graph {
+ 		   '--output-file', $filename );
+ 
+     # Sets the correct size on a by_graph basis
+-    push @params, "--size_x", CGI::param("size_x")
++    push @params, "--size_x", scalar CGI::param("size_x")
+       if (defined(CGI::param("size_x")));
+-    push @params, "--size_y", CGI::param("size_y")
++    push @params, "--size_y", scalar CGI::param("size_y")
+       if (defined(CGI::param("size_y")));
+-    push @params, "--upper_limit", CGI::param("upper_limit")
++    push @params, "--upper_limit", scalar CGI::param("upper_limit")
+       if (CGI::param("upper_limit"));
+-    push @params, "--lower_limit", CGI::param("lower_limit")
++    push @params, "--lower_limit", scalar CGI::param("lower_limit")
+       if (CGI::param("lower_limit"));
+ 
+     # Sometimes we want to set the IMG size, and not the canvas.
diff -Nru munin-2.0.25/debian/patches/series munin-2.0.25/debian/patches/series
--- munin-2.0.25/debian/patches/series	2014-11-27 20:49:20.000000000 +0100
+++ munin-2.0.25/debian/patches/series	2017-02-23 06:34:19.000000000 +0100
@@ -1 +1,2 @@
 0001-http_loadtime-plugin-Fix-several-bugs.patch
+0002-CVE-2017-6188.patch