diff --git a/OurUmbraco.Site/config/IISRewriteMaps.config b/OurUmbraco.Site/config/IISRewriteMaps.config
index 9ef0e7d8..8c0f0f83 100644
--- a/OurUmbraco.Site/config/IISRewriteMaps.config
+++ b/OurUmbraco.Site/config/IISRewriteMaps.config
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rewriteMaps>
 	<rewriteMap name="StaticDocRewrites" defaultValue="">
-    
-		<add key="wiki/reference/webconfig" value="/documentation/reference/config/webconfig/" />
-    
 		<add key="documentation/extending-umbraco/custom-file-systems" value="/documentation/extending/custom-file-systems/" />
 		<add key="documentation/extending-umbraco/version7-assets" value="/documentation/extending/version7-assets/" />
 		<add key="documentation/extending-umbraco/dashboards" value="/documentation/extending/dashboards/" />
@@ -439,6 +436,31 @@
 		<add key="documentation/implementation/routing/pipeline" value="/documentation/implementation/Routing/Default-Routing/" />
 		<add key="documentation/implementation/routing/pipeline/ishortstringhelper" value="/documentation/Legacy/" />
 
-    <add key="documentation/references/searching/examine/full-configuration" value="/documentation/Reference/Config/ExamineSettings/" />
+    	<add key="documentation/references/searching/examine/full-configuration" value="/documentation/Reference/Config/ExamineSettings/" />
+
+		<!-- WIKI -->
+		<add key="wiki/reference/webconfig" value="/Documentation/Reference/Config/WebConfig" />
+		<add key="wiki/reference/files-and-folders/permissions" value="/Documentation/Getting-Started/Setup/Install/Permissions" />
+		<add key="wiki/reference/api-cheatsheet/creating-a-document" value="/Documentation/Reference/Management/Services/ContentService" />
+		<add key="wiki/reference/api-cheatsheet/modifying-document-properties" value="/Documentation/Reference/Management/Models/Content" />
+		<add key="wiki/reference/api-cheatsheet/attaching-document-event-handlers" value="/Documentation/Reference/Events/ContentService-Events" />
+		<add key="wiki/reference/api-cheatsheet/attaching-document-event-handlers/change-the-documents-template" value="/Documentation/Reference/Management/Models/Content" />
+		<add key="wiki/reference/api-cheatsheet/working-with-nodefactory" value="/Documentation/Reference/Querying/IPublishedContent" />
+		<add key="wiki/reference/api-cheatsheet/enumerating-documents" value="/Documentation/Reference/Querying/IPublishedContent" />
+		<add key="wiki/reference/api-cheatsheet/working-with-members" value="/Documentation/Getting-Started/Data/Members" />
+		<add key="wiki/reference/api-cheatsheet/working-with-members/membertypes-creator-and-createmembertype-page" value="/Documentation/Getting-Started/Data/Members" />
+		<add key="wiki/reference/api-cheatsheet/working-with-members/manually-selecting-member-properties" value="/Documentation/Getting-Started/Data/Members" />
+		<add key="wiki/reference/api-cheatsheet/relationtypes-and-relations" value="/Documentation/Reference/Management/Services/RelationService" />
+		<add key="wiki/reference/api-cheatsheet/relationtypes-and-relations/object-guids-for-creating-relation-types" value="/apidocs/csharp/api/Umbraco.Core.Constants.ObjectTypes.html" />
+		<add key="wiki/reference/api-cheatsheet/publishing-and-republishing" value="/Documentation/Reference/Management/Services/ContentService" />
+		<add key="wiki/reference/api-cheatsheet/moving-a-document" value="/Documentation/Reference/Management/Services/ContentService" />
+		<add key="wiki/reference/api-cheatsheet/unpublish-a-document" value="/Documentation/Reference/Management/Services/ContentService" />
+		<add key="wiki/reference/api-cheatsheet/using-iapplicationeventhandler-to-register-events" value="/Documentation/Reference/Events/ContentService-Events" />
+		<add key="wiki/reference/files-and-folders/system-files-and-folders" value="/Documentation/Getting-Started/Setup/Install/Permissions" />
+		<add key="wiki/reference/files-and-folders/files-in-the-config-folder/umbracosettingsconfig" value="/Documentation/Reference/Config/umbracoSettings" />
+		<add key="wiki/reference/files-and-folders/files-in-the-config-folder/404handlersconfig" value="/Documentation/Reference/Routing/Request-Pipeline/IContentFinder" />
+		<add key="wiki/reference/files-and-folders/dashboardconfig" value="/Documentation/Extending/Dashboards" />
+		
+
 	</rewriteMap>
 </rewriteMaps>
diff --git a/OurUmbraco.Site/web.template.config b/OurUmbraco.Site/web.template.config
index 6a2cb518..7ba7b878 100644
--- a/OurUmbraco.Site/web.template.config
+++ b/OurUmbraco.Site/web.template.config
@@ -474,6 +474,31 @@
           </conditions>
           <action type="Redirect" url="{C:1}" redirectType="Permanent" appendQueryString="true" />
         </rule>
+        <!-- WIKI -->
+        <rule name="RedirectWikiEvents" patternSyntax="Wildcard">
+          <match url="wiki/reference/api-cheatsheet/using-applicationbase-to-register-events/*" />
+          <action type="Redirect" url="Documentation/Getting-Started/Code/Subscribing-To-Events/" redirectType="Permanent" appendQueryString="true" />
+        </rule>
+        <rule name="RedirectLinqToUmbraco" patternSyntax="Wildcard">
+          <match url="wiki/reference/api-cheatsheet/linq-to-umbraco/*" />
+          <action type="Redirect" url="/Documentation/Reference/Querying/IPublishedContent/" redirectType="Permanent" appendQueryString="true" />
+        </rule>
+        <rule name="UmbracoBase" patternSyntax="Wildcard">
+          <match url="wiki/reference/umbraco-base/*" />
+          <action type="Redirect" url="/Documentation/Reference/Routing/WebApi/" redirectType="Permanent" appendQueryString="true" />
+        </rule>
+        <rule name="Templates" patternSyntax="Wildcard">
+          <match url="wiki/reference/templates/*" />
+          <action type="Redirect" url="/Documentation/Getting-Started/Design/Templates/" redirectType="Permanent" appendQueryString="true" />
+        </rule>
+        <rule name="UmbracoLibrary" patternSyntax="Wildcard">
+          <match url="wiki/reference/umbracolibrary/*" />
+          <action type="Redirect" url="/apidocs/csharp/api/Umbraco.Core.html" redirectType="Permanent" appendQueryString="true" />
+        </rule>
+        <rule name="UmbracoInstallAndSetup" patternSyntax="Wildcard">
+          <match url="wiki/install-and-setup/*" />
+          <action type="Redirect" url="/Documentation/Getting-Started/Setup/" redirectType="Permanent" appendQueryString="true" />
+        </rule>
       </rules>
     </rewrite>
     <validation validateIntegratedModeConfiguration="false" />