diff --git a/components/perfdata/graphitewriter.cpp b/components/perfdata/graphitewriter.cpp
index 9226f5791..c0d6d3536 100644
--- a/components/perfdata/graphitewriter.cpp
+++ b/components/perfdata/graphitewriter.cpp
@@ -160,6 +160,15 @@ void GraphiteWriter::SendPerfdata(const String& prefix, const CheckResult::Ptr&
 		boost::algorithm::replace_all(escaped_key, "::", ".");
 
 		SendMetric(prefix, escaped_key, pdv->GetValue());
+
+		if (pdv->GetCrit())
+			SendMetric(prefix, escaped_key + "_crit", pdv->GetCrit());
+		if (pdv->GetWarn())
+			SendMetric(prefix, escaped_key + "_warn", pdv->GetWarn());
+		if (pdv->GetMin())
+			SendMetric(prefix, escaped_key + "_min", pdv->GetMin());
+		if (pdv->GetMax())
+			SendMetric(prefix, escaped_key + "_max", pdv->GetMax());
 	}
 }