diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -63,6 +63,15 @@ cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 25
 use_gravatar = true
+
+## alternative_gravatar_url allows you to use your own avatar server application
+## the following parts of the URL will be replaced
+## %(email)s        user email
+## %(md5email)s     md5 hash of the user email (like at gravatar.com)
+## %(size)s         size of the image that is expected from the server application
+#alternative_gravatar_url = http://myavatarserver.com/getbyemail/%(email)s/%(size)s
+#alternative_gravatar_url = http://myavatarserver.com/getbymd5/%(md5email)s?s=%(size)s
+
 container_auth_enabled = false
 proxypass_auth_enabled = false
 default_encoding = utf8
diff --git a/docs/changelog.rst b/docs/changelog.rst
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -38,6 +38,7 @@ news
 - Implemented #509, RhodeCode enforces SSL for push/pulling if requested.
 - Import remote svn repositories to mercurial using hgsubversion  
 - Fixed #508 RhodeCode now has a option to explicitly set forking permissions
+- RhodeCode can use alternative server for generating avatar icons
 
 fixes
 +++++
diff --git a/production.ini b/production.ini
--- a/production.ini
+++ b/production.ini
@@ -63,6 +63,15 @@ cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 50
 use_gravatar = true
+
+## alternative_gravatar_url allows you to use your own avatar server application
+## the following parts of the URL will be replaced
+## %(email)s        user email
+## %(md5email)s     md5 hash of the user email (like at gravatar.com)
+## %(size)s         size of the image that is expected from the server application
+#alternative_gravatar_url = http://myavatarserver.com/getbyemail/%(email)s/%(size)s
+#alternative_gravatar_url = http://myavatarserver.com/getbymd5/%(md5email)s?s=%(size)s
+
 container_auth_enabled = false
 proxypass_auth_enabled = false
 default_encoding = utf8
diff --git a/rhodecode/config/deployment.ini_tmpl b/rhodecode/config/deployment.ini_tmpl
--- a/rhodecode/config/deployment.ini_tmpl
+++ b/rhodecode/config/deployment.ini_tmpl
@@ -63,6 +63,7 @@ cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 50
 use_gravatar = true
+
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## %(email)s        user email
@@ -70,6 +71,7 @@ use_gravatar = true
 ## %(size)s         size of the image that is expected from the server application
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/%(email)s/%(size)s
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/%(md5email)s?s=%(size)s
+
 container_auth_enabled = false
 proxypass_auth_enabled = false
 default_encoding = utf8