diff --git a/theme/avatar.php b/theme/avatar.php
new file mode 100644
index 00000000..9623179f
--- /dev/null
+++ b/theme/avatar.php
@@ -0,0 +1,31 @@
+<?php
+
+$path = urldecode($_SERVER['QUERY_STRING']);
+$url = 'http://www.gravatar.com/avatar/'.$path;
+
+$headers = [];
+if(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']))
+	$headers[] = 'If-Modified-Since: '.$_SERVER['HTTP_IF_MODIFIED_SINCE'];
+if(isset($_SERVER['HTTP_IF_NONE_MATCH']))
+	$headers[] = 'If-None-Match: '.$_SERVER['HTTP_IF_NONE_MATCH'];
+
+$ch = curl_init($url);
+if(count($headers)) {
+	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+	$headers = [];
+}
+
+curl_setopt($ch, CURLOPT_HEADERFUNCTION,
+	function($handle, $line) use (&$headers) {
+		$headers[] = substr($line, 0, -2);
+		if(strlen($line) === 2) {
+			for($i=0,$c=count($headers)-1; $i<$c; $i++) {
+				header($headers[$i]);
+			}
+		}
+		return strlen($line);
+	});
+
+curl_exec($ch);
+curl_close($ch);
+
diff --git a/theme/scripts/comment.js b/theme/scripts/comment.js
index 9448084c..5efa3761 100644
--- a/theme/scripts/comment.js
+++ b/theme/scripts/comment.js
@@ -157,8 +157,7 @@ function sanitize_content(c) {
 }
 
 function comment_avatar(eh,sz) {
-	var host = 'https://secure.gravatar.com/avatar/';
-	return host + eh + '?s=' + sz;
+	return '/theme/avatar.php?' + encodeURIComponent(eh + '?s=' + sz);
 }
 
 function comment_friendly_date(d) {