diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
index 92b7d69b43..c0f960e817 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.js
@@ -1,6 +1,8 @@
 <import resource="classpath:/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js">
 
 var siteId = url.templateArgs.siteId;
+model.siteId = siteId;
+
 var filter = args.filter;
 
 model.pageList = getWikiPages(siteId, filter);
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 13dcf695dc..653a368d30 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
@@ -2,7 +2,6 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <channel rdf:about="http://www.alfresco.com/">
    <title>Alfresco - Wiki Page</title>
-   <link>${absurl(url.context)}/</link>
    <description>Alfresco Wiki Page - Recent Changes</description>
    <lastBuildDate>${xmldate(date)}</lastBuildDate>
    <pubDate>${xmldate(date)}</pubDate>
@@ -15,8 +14,7 @@
    <#assign page = p.page>
    <item>
       <title>${page.properties.title!""?html}</title>
-         <#assign navurl='/navigate/showDocDetails/' + page.nodeRef.storeRef.protocol + '/' + page.nodeRef.storeRef.identifier + '/' + page.nodeRef.id>
-      <link>${absurl(url.context)?replace("alfresco", "share/proxy/alfresco")}/api/node/content/${page.storeType}/${page.storeId}/${page.id}/${page.name?url}</link>
+      <link>${absurl(url.context)?replace("alfresco", "share/page/site/${siteId}/wiki-page?title=${page.name}")}</link>
       <pubDate>${xmldate(page.properties.modified)}</pubDate>
       <guid isPermaLink="false">${page.id}</guid>
    </item>