diff --git a/lib/chrony.pm b/lib/chrony.pm
new file mode 100644
index 0000000..faa6967
--- /dev/null
+++ b/lib/chrony.pm
@@ -0,0 +1,925 @@
+#
+# Monitorix - A lightweight system monitoring tool.
+#
+# Copyright (C) 2005-2016 by Jordi Sanfeliu <jordi@fibranet.cat>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+package chrony;
+
+use strict;
+use warnings;
+use Monitorix;
+use RRDs;
+use Exporter 'import';
+our @EXPORT = qw(chrony_init chrony_update chrony_cgi);
+
+sub chrony_init {
+	my $myself = (caller(0))[3];
+	my ($package, $config, $debug) = @_;
+	my $rrd = $config->{base_lib} . $package . ".rrd";
+	my $chrony = $config->{chrony};
+
+	my $info;
+	my @ds;
+	my @rra;
+	my @tmp;
+	my $n;
+
+	my @average;
+	my @min;
+	my @max;
+	my @last;
+
+	if(-e $rrd) {
+		$info = RRDs::info($rrd);
+		for my $key (keys %$info) {
+			if(index($key, 'ds[') == 0) {
+				if(index($key, '.type') != -1) {
+					push(@ds, substr($key, 3, index($key, ']') - 3));
+				}
+			}
+			if(index($key, 'rra[') == 0) {
+				if(index($key, '.rows') != -1) {
+					push(@rra, substr($key, 4, index($key, ']') - 4));
+				}
+													}
+		}
+		if(scalar(@ds) / 14 != scalar(my @il = split(',', $chrony->{list}))) {
+			logger("$myself: Detected size mismatch between 'list' (" . scalar(my @il = split(',', $chrony->{list})) . ") and $rrd (" . scalar(@ds) / 14 . "). Resizing it accordingly. All historical data will be lost. Backup file created.");
+			rename($rrd, "$rrd.bak");
+		}
+		if(scalar(@rra) < 12 + (4 * $config->{max_historic_years})) {
+			logger("$myself: Detected size mismatch between 'max_historic_years' (" . $config->{max_historic_years} . ") and $rrd (" . ((scalar(@rra) -12) / 4) . "). Resizing it accordingly. All historical data will be lost. Backup file created.");
+			rename($rrd, "$rrd.bak");
+		}
+	}
+
+	if(!(-e $rrd)) {
+		logger("Creating '$rrd' file.");
+		for($n = 1; $n <= $config->{max_historic_years}; $n++) {
+			push(@average, "RRA:AVERAGE:0.5:1440:" . (365 * $n));
+			push(@min, "RRA:MIN:0.5:1440:" . (365 * $n));
+			push(@max, "RRA:MAX:0.5:1440:" . (365 * $n));
+			push(@last, "RRA:LAST:0.5:1440:" . (365 * $n));
+		}
+		for($n = 0; $n < scalar(my @il = split(',', $chrony->{list})); $n++) {
+			push(@tmp, "DS:chrony" . $n . "_stratum:GAUGE:120:0:U");
+			push(@tmp, "DS:chrony" . $n . "_loffset:GAUGE:120:U:U");
+			push(@tmp, "DS:chrony" . $n . "_rmsoffs:GAUGE:120:U:U");
+			push(@tmp, "DS:chrony" . $n . "_freq:GAUGE:120:U:U");
+			push(@tmp, "DS:chrony" . $n . "_rfreq:GAUGE:120:U:U");
+			push(@tmp, "DS:chrony" . $n . "_skew:GAUGE:120:U:U");
+			push(@tmp, "DS:chrony" . $n . "_rootdel:GAUGE:120:U:U");
+			push(@tmp, "DS:chrony" . $n . "_rootdis:GAUGE:120:U:U");
+			push(@tmp, "DS:chrony" . $n . "_upintvl:GAUGE:120:0:U");
+			push(@tmp, "DS:chrony" . $n . "_val01:GAUGE:120:0:U");
+			push(@tmp, "DS:chrony" . $n . "_val02:GAUGE:120:0:U");
+			push(@tmp, "DS:chrony" . $n . "_val03:GAUGE:120:0:U");
+			push(@tmp, "DS:chrony" . $n . "_val04:GAUGE:120:0:U");
+			push(@tmp, "DS:chrony" . $n . "_val05:GAUGE:120:0:U");
+		}
+		eval {
+			RRDs::create($rrd,
+				"--step=60",
+				@tmp,
+				"RRA:AVERAGE:0.5:1:1440",
+				"RRA:AVERAGE:0.5:30:336",
+				"RRA:AVERAGE:0.5:60:744",
+				@average,
+				"RRA:MIN:0.5:1:1440",
+				"RRA:MIN:0.5:30:336",
+				"RRA:MIN:0.5:60:744",
+				@min,
+				"RRA:MAX:0.5:1:1440",
+				"RRA:MAX:0.5:30:336",
+				"RRA:MAX:0.5:60:744",
+				@max,
+				"RRA:LAST:0.5:1:1440",
+				"RRA:LAST:0.5:30:336",
+				"RRA:LAST:0.5:60:744",
+				@last,
+			);
+		};
+		my $err = RRDs::error;
+		if($@ || $err) {
+			logger("$@") unless !$@;
+			if($err) {
+				logger("ERROR: while creating $rrd: $err");
+				if($err eq "RRDs::error") {
+					logger("... is the RRDtool Perl package installed?");
+				}
+			}
+			return;
+		}
+	}
+
+	push(@{$config->{func_update}}, $package);
+	logger("$myself: Ok") if $debug;
+}
+
+sub chrony_update {
+	my $myself = (caller(0))[3];
+	my ($package, $config, $debug) = @_;
+	my $rrd = $config->{base_lib} . $package . ".rrd";
+	my $chrony = $config->{chrony};
+
+	my $n;
+	my $rrdata = "N";
+
+	my $e = 0;
+	foreach(my @cl = split(',', $chrony->{list})) {
+		my $stratum = 0;
+		my $loffset = 0;
+		my $rmsoffs = 0;
+		my $freq = 0;
+		my $rfreq = 0;
+		my $skew = 0;
+		my $rootdel = 0;
+		my $rootdis = 0;
+		my $upintvl = 0;
+		my $val01 = 0;
+		my $val02 = 0;
+		my $val03 = 0;
+		my $val04 = 0;
+		my $val05 = 0;
+
+		my $data;
+		my ($host, $port) = split(':', $cl[$e] || "");
+		$port = "" if !$port;
+		$port = "-p $port" if $port;
+		my $cmd = "chronyc -n -h $host $port tracking";
+
+		if(open(EXEC, "$cmd |")) {
+			while(<EXEC>) { $data .= $_; }
+			close(EXEC);
+		}
+
+		if(!$data) {
+			logger("$myself: unable to execute '" . $cmd . "' command or invalid connection.");
+			$rrdata .= ":$stratum:$loffset:$rmsoffs:$freq:$rfreq:$skew:$rootdel:$rootdis:$upintvl:0:0:0:0:0";
+			next;
+		}
+
+		foreach(my @l = split('\n', $data)) {
+			if(/^Stratum\s*:\s*(\d+)$/) {
+				$stratum = $1;
+			}
+			if(/^Last offset\s*:\s*(-?\d+\.\d+)\s+/) {
+				$loffset = $1;
+			}
+			if(/^RMS offset\s*:\s*(-?\d+\.\d+)\s+/) {
+				$rmsoffs = $1;
+			}
+			if(/^Frequency\s*:\s*(-?\d+\.\d+)\s+/) {
+				$freq = $1;
+			}
+			if(/^Residual freq\s*:\s*(-?\d+\.\d+)\s+/) {
+				$rfreq = $1;
+			}
+			if(/^Skew\s*:\s*(-?\d+\.\d+)\s+/) {
+				$skew = $1;
+			}
+			if(/^Root delay\s*:\s*(\d+\.\d+)\s+/) {
+				$rootdel = $1;
+			}
+			if(/^Root dispersion\s*:\s*(\d+\.\d+)\s+/) {
+				$rootdis = $1;
+			}
+			if(/^Update interval\s*:\s*(\d+\.\d+)\s+/) {
+				$upintvl = $1;
+			}
+		}
+		$rrdata .= ":$stratum:$loffset:$rmsoffs:$freq:$rfreq:$skew:$rootdel:$rootdis:$upintvl:0:0:0:0:0";
+		$e++;
+	}
+
+	RRDs::update($rrd, $rrdata);
+	logger("$myself: $rrdata") if $debug;
+	my $err = RRDs::error;
+	logger("ERROR: while updating $rrd: $err") if $err;
+}
+
+sub chrony_cgi {
+	my $myself = (caller(0))[3];
+	my ($package, $config, $cgi) = @_;
+
+	my $chrony = $config->{chrony};
+	my @rigid = split(',', ($chrony->{rigid} || ""));
+	my @limit = split(',', ($chrony->{limit} || ""));
+	my $tf = $cgi->{tf};
+	my $colors = $cgi->{colors};
+	my $graph = $cgi->{graph};
+	my $silent = $cgi->{silent};
+	my $zoom = "--zoom=" . $config->{global_zoom};
+	my %rrd = (
+		'new' => \&RRDs::graphv,
+		'old' => \&RRDs::graph,
+	);
+	my $version = "new";
+	my $pic;
+	my $picz;
+	my $picz_width;
+	my $picz_height;
+
+	my $u = "";
+	my $width;
+	my $height;
+	my @riglim;
+	my @IMG;
+	my @IMGz;
+	my @tmp;
+	my @tmpz;
+	my @CDEF;
+	my $e;
+	my $e2;
+	my $n;
+	my $n2;
+	my $str;
+	my $err;
+
+	$version = "old" if $RRDs::VERSION < 1.3;
+	my $rrd = $config->{base_lib} . $package . ".rrd";
+	my $title = $config->{graph_title}->{$package};
+	my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir};
+	my $imgfmt_uc = uc($config->{image_format});
+	my $imgfmt_lc = lc($config->{image_format});
+
+	$title = !$silent ? $title : "";
+
+
+	# text mode
+	#
+	if(lc($config->{iface_mode}) eq "text") {
+		if($title) {
+			main::graph_header($title, 2);
+			print("    <tr>\n");
+			print("    <td bgcolor='$colors->{title_bg_color}'>\n");
+		}
+		my (undef, undef, undef, $data) = RRDs::fetch("$rrd",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"AVERAGE",
+			"-r $tf->{res}");
+		$err = RRDs::error;
+		print("ERROR: while fetching $rrd: $err\n") if $err;
+		my $line1;
+		my $line2;
+		print("    <pre style='font-size: 12px; color: $colors->{fg_color}';>\n");
+		print("    ");
+		for($n = 0; $n < scalar(my @pl = split(',', $chrony->{list})); $n++) {
+			$line1 .= "    LastOffset  RMS_Offset  Root_Delay  RootDisper  Stra  Frequency    Skew  UpIntvl";
+			$line2 .= "------------------------------------------------------------------------------------";
+			if($line2) {
+				my $i = length($line2);
+				printf(sprintf("%${i}s", sprintf("%s", trim($pl[$n]))));
+			}
+		}
+		print("\n");
+		print("Time$line1\n");
+		print("----$line2 \n");
+		my $line;
+		my @row;
+		my $time;
+		my $n2;
+		my $from;
+		my $to;
+		for($n = 0, $time = $tf->{tb}; $n < ($tf->{tb} * $tf->{ts}); $n++) {
+			$line = @$data[$n];
+			$time = $time - (1 / $tf->{ts});
+			printf(" %2d$tf->{tc}", $time);
+			for($n2 = 0; $n2 < scalar(my @pl = split(',', $chrony->{list})); $n2++) {
+				undef(@row);
+				$from = $n2 * 22;
+				$to = $from + 22;
+				my ($stratum, $loffset, $rmsoffs, $freq, $rfreq, $skew, $rootdel, $rootdis, $upintvl) = @$line[$from..$to];
+				printf("   % 9.8f  %9.8f    %8.6f    %8.6f    %2.0f     %6.3f   %5.3f  %7.1f", $loffset || 0, $rmsoffs || 0, $rootdel || 0, $rootdis || 0, $stratum || 0, $freq || 0, $skew || 0, $upintvl || 0);
+			}
+			print("\n");
+		}
+		print("    </pre>\n");
+		if($title) {
+			print("    </td>\n");
+			print("    </tr>\n");
+			main::graph_footer();
+		}
+		print("  <br>\n");
+		return;
+	}
+
+
+	# graph mode
+	#
+	if($silent eq "yes" || $silent eq "imagetag") {
+		$colors->{fg_color} = "#000000";  # visible color for text mode
+		$u = "_";
+	}
+	if($silent eq "imagetagbig") {
+		$colors->{fg_color} = "#000000";  # visible color for text mode
+		$u = "";
+	}
+
+	for($n = 0; $n < scalar(my @cl = split(',', $chrony->{list})); $n++) {
+		for($n2 = 1; $n2 <= 6; $n2++) {
+			$str = $u . $package . $n . $n2 . "." . $tf->{when} . ".$imgfmt_lc";
+			push(@IMG, $str);
+			unlink("$IMG_DIR" . $str);
+			if(lc($config->{enable_zoom}) eq "y") {
+				$str = $u . $package . $n . $n2 . "z." . $tf->{when} . ".$imgfmt_lc";
+				push(@IMGz, $str);
+				unlink("$IMG_DIR" . $str);
+			}
+		}
+	}
+
+	$e = 0;
+	foreach my $url (my @cl = split(',', $chrony->{list})) {
+
+		my $data;
+		my ($host, $port) = split(':', $cl[$e] || "");
+		$port = "" if !$port;
+		$port = "-p $port" if $port;
+		my $cmd = "chronyc -n -h $host $port tracking";
+
+		if(open(EXEC, "$cmd |")) {
+			while(<EXEC>) { $data .= $_; }
+			close(EXEC);
+		}
+
+		next if !$data;
+
+		my $freq_status = "";
+		my $leap_status = "";
+		foreach(my @l = split('\n', $data)) {
+			if(/^Frequency\s*:\s*-?\d+\.\d+\s+ppm\s+(.*?)$/) {
+				$freq_status = trim($1);
+				next;
+			}
+			if(/^Leap status\s*:\s*(.*?)$/) {
+				$leap_status = trim($1);
+				next;
+			}
+		}
+		if($RRDs::VERSION > 1.2) {
+			$leap_status = "COMMENT: Leap status\\: $leap_status\\c",
+		} else {
+			$leap_status = "COMMENT: Leap status: $leap_status\\c",
+		}
+
+		my $driver = "";
+		my $timeleft = "";
+		my $temp_scale = "";
+
+		if($e) {
+			print("  <br>\n");
+		}
+		if($title) {
+			main::graph_header($title, 2);
+		}
+		@riglim = @{setup_riglim($rigid[0], $limit[0])};
+		if($title) {
+			print("    <tr>\n");
+			print("    <td valign='top' bgcolor='$colors->{title_bg_color}'>\n");
+		}
+		undef(@tmp);
+		undef(@tmpz);
+		undef(@CDEF);
+		push(@tmp, "LINE2:loffset#44EEEE:Last offset");
+		push(@tmp, "GPRINT:loffset:LAST:Cur\\: %9.8lf");
+		push(@tmp, "GPRINT:loffset:AVERAGE:Avg\\: %9.8lf");
+		push(@tmp, "GPRINT:loffset:MIN:Min\\: %9.8lf");
+		push(@tmp, "GPRINT:loffset:MAX:Max\\: %9.8lf\\n");
+		push(@tmp, "LINE2:rmsoffs#44EE44:RMS offset");
+		push(@tmp, "GPRINT:rmsoffs:LAST: Cur\\: %9.8lf");
+		push(@tmp, "GPRINT:rmsoffs:AVERAGE: Avg\\: %9.8lf");
+		push(@tmp, "GPRINT:rmsoffs:MIN: Min\\: %9.8lf");
+		push(@tmp, "GPRINT:rmsoffs:MAX: Max\\: %9.8lf\\n");
+		push(@tmpz, "LINE2:loffset#44EEEE:Last offset");
+		push(@tmpz, "LINE2:rmsoffs#44EE44:RMS offset");
+		if(lc($config->{show_gaps}) eq "y") {
+			push(@tmp, "AREA:wrongdata#$colors->{gap}:");
+			push(@tmpz, "AREA:wrongdata#$colors->{gap}:");
+			push(@CDEF, "CDEF:wrongdata=allvalues,UN,INF,UNKN,IF");
+		}
+
+		($width, $height) = split('x', $config->{graph_size}->{main});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+		}
+		$pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 5]",
+			"--title=$config->{graphs}->{_chrony1}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=$imgfmt_uc",
+			"--vertical-label=Seconds",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			$zoom,
+			@{$cgi->{version12}},
+			@{$colors->{graph_colors}},
+			"DEF:loffset=$rrd:chrony" . $e . "_loffset:AVERAGE",
+			"DEF:rmsoffs=$rrd:chrony" . $e . "_rmsoffs:AVERAGE",
+			"CDEF:allvalues=loffset,rmsoffs,+",
+			@CDEF,
+			"COMMENT: \\n",
+			@tmp,
+			"COMMENT: \\n",
+			$leap_status,
+			"COMMENT: \\n");
+		$err = RRDs::error;
+		print("ERROR: while graphing $IMG_DIR" . "$IMG[$e * 5]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			$picz = $rrd{$version}->("$IMG_DIR" . "$IMGz[$e * 5]",
+				"--title=$config->{graphs}->{_chrony1}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=$imgfmt_uc",
+				"--vertical-label=Seconds",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				$zoom,
+				@{$cgi->{version12}},
+				@{$colors->{graph_colors}},
+				"DEF:loffset=$rrd:chrony" . $e . "_loffset:AVERAGE",
+				"DEF:rmsoffs=$rrd:chrony" . $e . "_rmsoffs:AVERAGE",
+				"CDEF:allvalues=loffset,rmsoffs,+",
+				@CDEF,
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $IMG_DIR" . "$IMGz[$e * 5]: $err\n") if $err;
+		}
+		$e2 = $e + 1;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /chrony$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 5] . "\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 5] . "' border='0'></a>\n");
+				} else {
+					if($version eq "new") {
+						$picz_width = $picz->{image_width} * $config->{global_zoom};
+						$picz_height = $picz->{image_height} * $config->{global_zoom};
+					} else {
+						$picz_width = $width + 115;
+						$picz_height = $height + 100;
+					}
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 5] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 5] . "'>\n");
+			}
+		}
+
+		@riglim = @{setup_riglim($rigid[1], $limit[1])};
+		undef(@tmp);
+		undef(@tmpz);
+		undef(@CDEF);
+		push(@tmp, "LINE2:rootdel#4444EE:Root delay");
+		push(@tmp, "GPRINT:rootdel:LAST:      Cur\\: %8.6lf");
+		push(@tmp, "GPRINT:rootdel:AVERAGE:  Avg\\: %8.6lf");
+		push(@tmp, "GPRINT:rootdel:MIN:  Min\\: %8.6lf");
+		push(@tmp, "GPRINT:rootdel:MAX:  Max\\: %8.6lf\\n");
+		push(@tmp, "LINE2:rootdis#44EEEE:Root dispersion");
+		push(@tmp, "GPRINT:rootdis:LAST: Cur\\: %8.6lf");
+		push(@tmp, "GPRINT:rootdis:AVERAGE:  Avg\\: %8.6lf");
+		push(@tmp, "GPRINT:rootdis:MIN:  Min\\: %8.6lf");
+		push(@tmp, "GPRINT:rootdis:MAX:  Max\\: %8.6lf\\n");
+		push(@tmp, "LINE2:rootdel#4444EE");
+		push(@tmp, "LINE2:rootdis#44EEEE");
+		push(@tmpz, "LINE2:rootdel#4444EE:Root delay");
+		push(@tmpz, "LINE2:rootdis#44EEEE:Root dispersion");
+		if(lc($config->{show_gaps}) eq "y") {
+			push(@tmp, "AREA:wrongdata#$colors->{gap}:");
+			push(@tmpz, "AREA:wrongdata#$colors->{gap}:");
+			push(@CDEF, "CDEF:wrongdata=allvalues,UN,INF,UNKN,IF");
+		}
+
+		($width, $height) = split('x', $config->{graph_size}->{main});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+		}
+		$pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 6 + 1]",
+			"--title=$config->{graphs}->{_chrony2}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=$imgfmt_uc",
+			"--vertical-label=Seconds",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			$zoom,
+			@{$cgi->{version12}},
+			@{$colors->{graph_colors}},
+			"DEF:rootdel=$rrd:chrony" . $e . "_rootdel:AVERAGE",
+			"DEF:rootdis=$rrd:chrony" . $e . "_rootdis:AVERAGE",
+			"CDEF:allvalues=rootdel,rootdis,+",
+			@CDEF,
+			"COMMENT: \\n",
+			@tmp,
+			"COMMENT: \\n");
+		$err = RRDs::error;
+		print("ERROR: while graphing $IMG_DIR" . "$IMG[$e * 6 + 1]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			$picz = $rrd{$version}->("$IMG_DIR" . "$IMGz[$e * 6 + 1]",
+				"--title=$config->{graphs}->{_chrony2}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=$imgfmt_uc",
+				"--vertical-label=Seconds",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				$zoom,
+				@{$cgi->{version12}},
+				@{$colors->{graph_colors}},
+				"DEF:rootdel=$rrd:chrony" . $e . "_rootdel:AVERAGE",
+				"DEF:rootdis=$rrd:chrony" . $e . "_rootdis:AVERAGE",
+				"CDEF:allvalues=rootdel,rootdis,+",
+				@CDEF,
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $IMG_DIR" . "$IMGz[$e * 6 + 1]: $err\n") if $err;
+		}
+		$e2 = $e + 2;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /chrony$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 1] . "' border='0'></a>\n");
+				} else {
+					if($version eq "new") {
+						$picz_width = $picz->{image_width} * $config->{global_zoom};
+						$picz_height = $picz->{image_height} * $config->{global_zoom};
+					} else {
+						$picz_width = $width + 115;
+						$picz_height = $height + 100;
+					}
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 1] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 1] . "'>\n");
+			}
+		}
+
+		if($title) {
+			print("    </td>\n");
+			print("    <td valign='top' bgcolor='" . $colors->{title_bg_color} . "'>\n");
+		}
+
+		@riglim = @{setup_riglim($rigid[2], $limit[2])};
+		undef(@tmp);
+		undef(@tmpz);
+		undef(@CDEF);
+		push(@tmp, "LINE2:stratum#44EEEE:Stratum");
+		push(@tmp, "GPRINT:stratum:LAST:              Current\\: %2.0lf\\n");
+		push(@tmpz, "LINE2:stratum#44EEEE:Stratum");
+		if(lc($config->{show_gaps}) eq "y") {
+			push(@tmp, "AREA:wrongdata#$colors->{gap}:");
+			push(@tmpz, "AREA:wrongdata#$colors->{gap}:");
+			push(@CDEF, "CDEF:wrongdata=allvalues,UN,INF,UNKN,IF");
+		}
+		($width, $height) = split('x', $config->{graph_size}->{small});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+		}
+		$pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 6 + 2]",
+			"--title=$config->{graphs}->{_chrony3}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=$imgfmt_uc",
+			"--vertical-label=Level",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			$zoom,
+			@{$cgi->{version12}},
+			@{$cgi->{version12_small}},
+			@{$colors->{graph_colors}},
+			"DEF:stratum=$rrd:chrony" . $e . "_stratum:AVERAGE",
+			"CDEF:allvalues=stratum",
+			@CDEF,
+			@tmp);
+		$err = RRDs::error;
+		print("ERROR: while graphing $IMG_DIR" . "$IMG[$e * 6 + 2]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			$picz = $rrd{$version}->("$IMG_DIR" . "$IMGz[$e * 6 + 2]",
+				"--title=$config->{graphs}->{_chrony3}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=$imgfmt_uc",
+				"--vertical-label=Level",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				$zoom,
+				@{$cgi->{version12}},
+				@{$cgi->{version12_small}},
+				@{$colors->{graph_colors}},
+				"DEF:stratum=$rrd:chrony" . $e . "_stratum:AVERAGE",
+				"CDEF:allvalues=stratum",
+				@CDEF,
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $IMG_DIR" . "$IMGz[$e * 6 + 2]: $err\n") if $err;
+		}
+		$e2 = $e + 3;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /chrony$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 2] . "' border='0'></a>\n");
+				} else {
+					if($version eq "new") {
+						$picz_width = $picz->{image_width} * $config->{global_zoom};
+						$picz_height = $picz->{image_height} * $config->{global_zoom};
+					} else {
+						$picz_width = $width + 115;
+						$picz_height = $height + 100;
+					}
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 2] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 2] . "'>\n");
+			}
+		}
+
+		@riglim = @{setup_riglim($rigid[3], $limit[3])};
+		undef(@tmp);
+		undef(@tmpz);
+		undef(@CDEF);
+		push(@tmp, "LINE2:freq#EE44EE:Frequency");
+		push(@tmp, "GPRINT:freq:LAST:            Current\\: %5.3lf\\n");
+		push(@tmp, "GPRINT:freq_s:LAST:                        %3.1lf s/day ($freq_status)\\n");
+		push(@tmpz, "LINE2:freq#EE44EE:Frequency");
+		if(lc($config->{show_gaps}) eq "y") {
+			push(@tmp, "AREA:wrongdata#$colors->{gap}:");
+			push(@tmpz, "AREA:wrongdata#$colors->{gap}:");
+			push(@CDEF, "CDEF:wrongdata=allvalues,UN,INF,UNKN,IF");
+		}
+		($width, $height) = split('x', $config->{graph_size}->{small});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+		}
+		$pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 6 + 3]",
+			"--title=$config->{graphs}->{_chrony4}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=$imgfmt_uc",
+			"--vertical-label=PPM",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			$zoom,
+			@{$cgi->{version12}},
+			@{$cgi->{version12_small}},
+			@{$colors->{graph_colors}},
+			"DEF:freq=$rrd:chrony" . $e . "_freq:AVERAGE",
+			"CDEF:freq_s=freq,86400,*,1000000,/",
+			"CDEF:allvalues=freq",
+			@CDEF,
+			@tmp);
+		$err = RRDs::error;
+		print("ERROR: while graphing $IMG_DIR" . "$IMG[$e * 6 + 3]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			$picz = $rrd{$version}->("$IMG_DIR" . "$IMGz[$e * 6 + 3]",
+				"--title=$config->{graphs}->{_chrony4}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=$imgfmt_uc",
+				"--vertical-label=PPM",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				$zoom,
+				@{$cgi->{version12}},
+				@{$cgi->{version12_small}},
+				@{$colors->{graph_colors}},
+				"DEF:freq=$rrd:chrony" . $e . "_freq:AVERAGE",
+				"CDEF:freq_s=freq,86400,*,1000000,/",
+				"CDEF:allvalues=freq",
+				@CDEF,
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $IMG_DIR" . "$IMGz[$e * 6 + 3]: $err\n") if $err;
+		}
+		$e2 = $e + 4;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /chrony$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 3] . "' border='0'></a>\n");
+				} else {
+					if($version eq "new") {
+						$picz_width = $picz->{image_width} * $config->{global_zoom};
+						$picz_height = $picz->{image_height} * $config->{global_zoom};
+					} else {
+						$picz_width = $width + 115;
+						$picz_height = $height + 100;
+					}
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 3] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 3] . "'>\n");
+			}
+		}
+
+		@riglim = @{setup_riglim($rigid[4], $limit[4])};
+		undef(@tmp);
+		undef(@tmpz);
+		undef(@CDEF);
+		push(@tmp, "LINE2:skew#963C74:Skew");
+		push(@tmp, "GPRINT:skew:LAST:                 Current\\: %5.3lf\\n");
+		push(@tmpz, "LINE2:skew#963C74:Skew");
+		if(lc($config->{show_gaps}) eq "y") {
+			push(@tmp, "AREA:wrongdata#$colors->{gap}:");
+			push(@tmpz, "AREA:wrongdata#$colors->{gap}:");
+			push(@CDEF, "CDEF:wrongdata=allvalues,UN,INF,UNKN,IF");
+		}
+		($width, $height) = split('x', $config->{graph_size}->{small});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+		}
+		$pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 6 + 4]",
+			"--title=$config->{graphs}->{_chrony5}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=$imgfmt_uc",
+			"--vertical-label=PPM",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			$zoom,
+			@{$cgi->{version12}},
+			@{$cgi->{version12_small}},
+			@{$colors->{graph_colors}},
+			"DEF:skew=$rrd:chrony" . $e . "_skew:AVERAGE",
+			"CDEF:allvalues=skew",
+			@CDEF,
+			@tmp);
+		$err = RRDs::error;
+		print("ERROR: while graphing $IMG_DIR" . "$IMG[$e * 6 + 4]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			$picz = $rrd{$version}->("$IMG_DIR" . "$IMGz[$e * 6 + 4]",
+				"--title=$config->{graphs}->{_chrony5}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=$imgfmt_uc",
+				"--vertical-label=PPM",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				$zoom,
+				@{$cgi->{version12}},
+				@{$cgi->{version12_small}},
+				@{$colors->{graph_colors}},
+				"DEF:skew=$rrd:chrony" . $e . "_skew:AVERAGE",
+				"CDEF:allvalues=skew",
+				@CDEF,
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $IMG_DIR" . "$IMGz[$e * 6 + 4]: $err\n") if $err;
+		}
+		$e2 = $e + 5;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /chrony$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 4] . "' border='0'></a>\n");
+				} else {
+					if($version eq "new") {
+						$picz_width = $picz->{image_width} * $config->{global_zoom};
+						$picz_height = $picz->{image_height} * $config->{global_zoom};
+					} else {
+						$picz_width = $width + 115;
+						$picz_height = $height + 100;
+					}
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 4] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 4] . "'>\n");
+			}
+		}
+
+		@riglim = @{setup_riglim($rigid[5], $limit[5])};
+		undef(@tmp);
+		undef(@tmpz);
+		undef(@CDEF);
+		push(@tmp, "LINE2:upintvl#EEEE44:Update interval");
+		push(@tmp, "GPRINT:upintvl:LAST:      Current\\: %6.1lf\\n");
+		push(@tmpz, "LINE2:upintvl#EEEE44:Update interval");
+		if(lc($config->{show_gaps}) eq "y") {
+			push(@tmp, "AREA:wrongdata#$colors->{gap}:");
+			push(@tmpz, "AREA:wrongdata#$colors->{gap}:");
+			push(@CDEF, "CDEF:wrongdata=allvalues,UN,INF,UNKN,IF");
+		}
+		($width, $height) = split('x', $config->{graph_size}->{small});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+		}
+		$pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 6 + 5]",
+			"--title=$config->{graphs}->{_chrony6}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=$imgfmt_uc",
+			"--vertical-label=Seconds",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			$zoom,
+			@{$cgi->{version12}},
+			@{$cgi->{version12_small}},
+			@{$colors->{graph_colors}},
+			"DEF:upintvl=$rrd:chrony" . $e . "_upintvl:AVERAGE",
+			"CDEF:allvalues=upintvl",
+			@CDEF,
+			@tmp);
+		$err = RRDs::error;
+		print("ERROR: while graphing $IMG_DIR" . "$IMG[$e * 6 + 5]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			$picz = $rrd{$version}->("$IMG_DIR" . "$IMGz[$e * 6 + 5]",
+				"--title=$config->{graphs}->{_chrony6}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=$imgfmt_uc",
+				"--vertical-label=Seconds",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				$zoom,
+				@{$cgi->{version12}},
+				@{$cgi->{version12_small}},
+				@{$colors->{graph_colors}},
+				"DEF:upintvl=$rrd:chrony" . $e . "_upintvl:AVERAGE",
+				"CDEF:allvalues=upintvl",
+				@CDEF,
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $IMG_DIR" . "$IMGz[$e * 6 + 5]: $err\n") if $err;
+		}
+		$e2 = $e + 6;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /chrony$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 5] . "' border='0'></a>\n");
+				} else {
+					if($version eq "new") {
+						$picz_width = $picz->{image_width} * $config->{global_zoom};
+						$picz_height = $picz->{image_height} * $config->{global_zoom};
+					} else {
+						$picz_width = $width + 115;
+						$picz_height = $height + 100;
+					}
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 5] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . "/" . $config->{imgs_dir} . $IMG[$e * 6 + 5] . "'>\n");
+			}
+		}
+
+		if($title) {
+			print("    </td>\n");
+			print("    </tr>\n");
+
+			print("    <tr>\n");
+			print "      <td bgcolor='$colors->{title_bg_color}' colspan='2'>\n";
+			print "       <font face='Verdana, sans-serif' color='$colors->{title_fg_color}'>\n";
+			print "       <font size='-1'>\n";
+			print "        <b style='{color: " . $colors->{title_fg_color} . "}'>&nbsp;&nbsp;" . trim($url) . "</b>\n";
+			print "       </font></font>\n";
+			print "      </td>\n";
+			print("    </tr>\n");
+			main::graph_footer();
+		}
+		$e++;
+	}
+	print("  <br>\n");
+	return;
+}
+
+1;
diff --git a/monitorix.conf b/monitorix.conf
index a66c5ae..31df945 100644
--- a/monitorix.conf
+++ b/monitorix.conf
@@ -103,6 +103,7 @@ secure_log_date_format = %b %e
 	nfsc		= n
 	bind		= n
 	ntp		= n
+	chrony		= n
 	fail2ban	= n
 	icecast		= n
 	raspberrypi	= n
@@ -535,6 +536,15 @@ secure_log_date_format = %b %e
 </ntp>
 
 
+# CHRONY graph
+# -----------------------------------------------------------------------------
+<chrony>
+	list = localhost
+	rigid = 0, 0, 0, 0, 0, 0
+	limit = 100, 100, 100, 100, 100, 100
+</chrony>
+
+
 # FAIL2BAN graph
 # -----------------------------------------------------------------------------
 <fail2ban>
@@ -775,7 +785,7 @@ logo_bottom = logo_bot.png
 	remote	= 300x100
 </graph_size>
 
-graph_name = system, kern, proc, hptemp, lmsens, nvidia, disk, fs, zfs, du, net, netstat, tc, libvirt, process, serv, mail, port, user, ftp, apache, nginx, lighttpd, mysql, varnish, pagespeed, squid, nfss, nfsc, bind, ntp, fail2ban, icecast, raspberrypi, phpapc, memcached, apcupsd, nut, wowza, int, verlihub
+graph_name = system, kern, proc, hptemp, lmsens, nvidia, disk, fs, zfs, du, net, netstat, tc, libvirt, process, serv, mail, port, user, ftp, apache, nginx, lighttpd, mysql, varnish, pagespeed, squid, nfss, nfsc, bind, ntp, chrony, fail2ban, icecast, raspberrypi, phpapc, memcached, apcupsd, nut, wowza, int, verlihub
 
 <graph_title>
 	system		= System load average and usage
@@ -809,6 +819,7 @@ graph_name = system, kern, proc, hptemp, lmsens, nvidia, disk, fs, zfs, du, net,
 	nfsc		= NFS client statistics
 	bind		= BIND statistics
 	ntp		= NTP statistics
+	chrony		= Chrony statistics
 	fail2ban	= Fail2ban statistics
 	icecast		= Icecast Streaming Media Server
 	raspberrypi	= Raspberry Pi sensor statistics
@@ -959,6 +970,12 @@ graph_name = system, kern, proc, hptemp, lmsens, nvidia, disk, fs, zfs, du, net,
 	_ntp1		= NTP timing stats
 	_ntp2		= Stratum level
 	_ntp3		= Codes
+	_chrony1	= Chrony timing stats
+	_chrony2	= Network path delays
+	_chrony3	= Stratum level
+	_chrony4	= System's clock drift
+	_chrony5	= Estimated error in frequency
+	_chrony6	= Update interval
 	_fail2ban	= Fail2ban jails
 	_icecast1	= Current listeners
 	_icecast2	= Bitrate