diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl
index a624fdeb86..dd01274f9f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl
@@ -8,14 +8,14 @@
    <generator>Alfresco ${server.edition} v${server.version}</generator>
    <image>
       <title>Alfresco - Wiki Page Recent Changes</title>
-      <url>${absurl(url.context)?replace("alfresco", "share/proxy/alfresco")}/images/logo/AlfrescoLogo200.png</url>
+      <url>${shareUrl}/proxy/alfresco/images/logo/AlfrescoLogo200.png</url>
    </image>
    <#list wiki.pages?sort_by(['modified'])?reverse as p>
    <#assign node = p.node>
    <#assign page = p.page>
    <item>
       <title>${(page.title!"")?html}</title>
-      <link>${absurl(url.context)?replace("alfresco", "share/page/site/${siteId}/wiki-page?title=${page.systemName}")}</link>
+      <link>${shareUrl}/page/site/${siteId}/wiki-page?title=${page.systemName}</link>
       <pubDate>${page.modifiedAt?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
       <guid isPermaLink="false">${node.id}</guid>
    </item>
diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index cde8e14afa..bc04726848 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -1608,6 +1608,7 @@
    <bean id="webscript.org.alfresco.slingshot.wiki.pagelist.get"
          class="org.alfresco.repo.web.scripts.wiki.WikiPageListGet"
          parent="abstractWikiWebScript">
+      <property name="sysAdminParams" ref="sysAdminParams" />
    </bean>
    
    
diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java
index b93c46d11f..06ce6819b7 100644
--- a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java
@@ -26,11 +26,14 @@ import java.util.Map;
 
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
+import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.wiki.WikiServiceImpl;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.TemplateService;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.wiki.WikiPageInfo;
+import org.alfresco.util.UrlUtil;
 import org.json.simple.JSONObject;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.Status;
@@ -47,6 +50,14 @@ public class WikiPageListGet extends AbstractWikiWebScript
    protected static final int RECENT_SEARCH_PERIOD_DAYS = 7;
    protected static final long ONE_DAY_MS = 24*60*60*1000;
    
+   // Injected services
+   private SysAdminParams sysAdminParams;
+   
+   public void setSysAdminParams(SysAdminParams sysAdminParams)
+   {
+      this.sysAdminParams = sysAdminParams;
+   }
+   
    @Override
    protected Map<String, Object> executeImpl(SiteInfo site, String pageName,
          WebScriptRequest req, JSONObject json, Status status, Cache cache) 
@@ -166,6 +177,7 @@ public class WikiPageListGet extends AbstractWikiWebScript
       model.put("wiki", wiki);
       model.put("siteId", site.getShortName());
       model.put("site", site);
+      model.put(TemplateService.KEY_SHARE_URL, UrlUtil.getShareUrl(sysAdminParams));
       return model;
    }
 }