diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
new file mode 100644
index 0000000000..4b8c84b456
--- /dev/null
+++ b/actions/avatarbynickname.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class AvatarbynicknameAction extends Action {
+    function handle($args) {
+        parent::handle($args);
+        $nickname = $this->trimmed('nickname');
+        if (!$nickname) {
+        	$this->client_error(_t('No nickname.'));
+			return;
+		}
+		$size = $this->trimmed('size');
+        if (!$size) {
+        	$this->client_error(_t('No size.'));
+			return;
+		}
+		$size = strtolower($size);
+		if (!in_array($size, array('original', '96', '48', '24'))) {
+        	$this->client_error(_t('Invalid size.'));
+			return;
+		}
+			
+		$user = User::staticGet('nickname', $nickname);
+		if ($user) {
+        	$this->client_error(_t('No such user.'));
+			return;
+		}
+		$profile = $user->getProfile();
+		if (!$profile) {
+        	$this->client_error(_t('No such profile.'));
+			return;
+		}
+		if ($size == 'original') {
+			$avatar = $profile->getOriginal();
+		} else {
+			$avatar = $profile->getAvatar($size+0);
+		}
+		
+		if ($avatar) {
+			$url = $avatar->url;
+		} else {
+			if ($size == 'original') {
+				$url = common_default_avatar(AVATAR_PROFILE_SIZE);
+			} else {
+				$url = common_default_avatar($size+0);
+			}
+		}
+		common_redirect($url, 302);
+	}
+}
diff --git a/htaccess.sample b/htaccess.sample
index 8c9e16c470..c0ba80f5d1 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -51,5 +51,6 @@ RewriteRule ^(\w+)/all/rss$ index.php?action=allrss&nickname=$1 [L,QSA]
 RewriteRule ^(\w+)/foaf$ index.php?action=foaf&nickname=$1 [L,QSA]
 RewriteRule ^(\w+)/replies$ index.php?action=replies&nickname=$1 [L,QSA]
 RewriteRule ^(\w+)/replies/rss$ index.php?action=repliesrss&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/avatar/(original|96|48|24)$ index.php?action=avatarbynickname&nickname=$1&size=$2 [L,QSA]
 
 RewriteRule ^(\w+)$ index.php?action=showstream&nickname=$1 [L,QSA]
diff --git a/lib/util.php b/lib/util.php
index 7627cafdcd..512f2deceb 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -780,6 +780,8 @@ function common_fancy_url($action, $args=NULL) {
 		return common_path('search/notice' . (($args) ? ('?' . http_build_query($args)) : ''));
 	 case 'noticesearchrss':
 		return common_path('search/notice/rss' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'avatarbynickname':
+		return common_path($args['nickname'].'/avatar/'.$args['size']);
 	 default:
 		return common_simple_url($action, $args);
 	}