--- IkiWiki/Plugin/comments-20190509-1-ikiwiki_3_20141016_4_deb8u1.pm.bak	2017-01-11 19:18:52.000000000 +0100
+++ IkiWiki/Plugin/comments.pm	2019-05-10 04:25:09.364000000 +0200
@@ -641,8 +641,20 @@
 	my $user=shift;
 	return undef unless defined $user;
 
 	my $avatar;
+
+	# Try using a locally hosted avatar, first.
+	if ($user !~ m#^(?:\.|\.\.|.*/.*)$#) {
+		foreach my $testuri (
+			'/avatar/'.$user.'.png',
+			'/avatar/'.$user.'.jpg'
+		) {
+	       		return $testuri if -f $config{destdir}.$testuri;
+		}
+	}
+
+	# Only then embed external resources.
 	eval q{use Libravatar::URL};
 	if (! $@) {
 		my $oiduser = eval { IkiWiki::openiduser($user) };
 		my $https=defined $config{url} && $config{url}=~/^https:/;