diff --git a/.hgsub b/.hgsub
index 1898a8734..daec5f2d9 100644
--- a/.hgsub
+++ b/.hgsub
@@ -1,7 +1,7 @@
 
 src/Orchard.Web/Modules/Orchard.Forms = https://hg01.codeplex.com/orchardforms
 src/Orchard.Web/Modules/Orchard.Rules = https://hg01.codeplex.com/orchardrules
-src/Orchard.Web/Modules/Orchard.Tokens = https://hg01.codeplex.com/forks/randompete/autoroutetokens
+src/Orchard.Web/Modules/Orchard.Tokens = https://hg01.codeplex.com/orchardtokens
 src/Orchard.Web/Modules/Orchard.TaskLease = https://hg01.codeplex.com/orchardtasklease
 src/orchard.web/modules/Orchard.Fields = https://hg01.codeplex.com/orchardfields
 src/Orchard.Web/Modules/Orchard.Routable = https://hg01.codeplex.com/forks/randompete/routablealias
diff --git a/.hgsubstate b/.hgsubstate
index 34f665a7c..b27cac798 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -3,7 +3,7 @@ c54cb640d6bc14c51b9fb9bd78231bb0facec067 src/Orchard.Web/Modules/Orchard.Forms
 a1ef39ba4e2d0cd78b3c91d6150e841793acb34b src/Orchard.Web/Modules/Orchard.Routable
 204bdef384f41bb5e463bed6b98a056945a7d839 src/Orchard.Web/Modules/Orchard.Rules
 ce578373f907c0a55fd91229a344f0755f290174 src/Orchard.Web/Modules/Orchard.TaskLease
-5207d27b3acb559fc5dc65a2dbaf307cac8474de src/Orchard.Web/Modules/Orchard.Tokens
+cf73534c335f39e6d9695c2a0ce64c426d1be9f2 src/Orchard.Web/Modules/Orchard.Tokens
 8375c8c10297aa9b66f792354bed25268184cd08 src/orchard.web/modules/Orchard.Alias
 c47e38db47abfaca2585bc7a34dd6820233d9f87 src/orchard.web/modules/Orchard.Fields
 913ced6d47a208394f8149d1573c2f2d61240d24 src/orchard.web/modules/orchard.Projections