diff --git a/plainbook/gherkin.xml b/plainbook/gherkin.xml
index 8d0a089..90471fb 100644
--- a/plainbook/gherkin.xml
+++ b/plainbook/gherkin.xml
@@ -500,7 +500,7 @@ an &lsquo;at&rsquo; sign (@) before the tag name. For example:</p>
 <p>You can tag a feature or a scenario. Feature tags are automatically inherited by all the enclosed scenarios and scenario outlines. Cucumber
 also supports some more advanced tag features, such as enforcing the limit on the number of scenarios with a particular tag (useful for work-in-progress) and
 running scenarios that satisfy a combination of tags. For information on those options, have a look at 
-the <url link="https://github.com/aslakhellesoy/cucumber/wiki/tags" title="tags page on the Cucumber wiki"/>.</p>
+the <url link="https://github.com/cucumber/cucumber/wiki/tags" title="tags page on the Cucumber wiki"/>.</p>
 </section>
 <section title="Remember">
 <ul>
diff --git a/plainbook/resources.xml b/plainbook/resources.xml
index 6490705..fd6b90e 100644
--- a/plainbook/resources.xml
+++ b/plainbook/resources.xml
@@ -4,10 +4,10 @@
 <section title="Tools" id="sec_resources_tools">
 <ul>
 <li>Cucumber main web site <url link="http://cukes.info" /></li>
-<li>Cucumber wiki <url link="http://wiki.github.com/aslakhellesoy/cucumber/" /></li>
+<li>Cucumber wiki <url link="http://wiki.github.com/cucumber/cucumber/" /></li>
 <li>Specflow <url link="http://specflow.org" /> </li>
 <li>Cuke4Nuke <url link="http://github.com/richardlawrence/Cuke4Nuke" /></li>
-<li>Cuke4Duke <url link="http://wiki.github.com/aslakhellesoy/cuke4duke/" /></li>
+<li>Cuke4Duke <url link="http://wiki.github.com/cucumber/cuke4duke/" /></li>
 <li>Cuke4Nuke Visual Studio Plugin <url link="http://github.com/henritersteeg/cuke4vs" /></li>
 </ul>
 </section>
diff --git a/plainbook/tables.xml b/plainbook/tables.xml
index d31a955..c5884eb 100644
--- a/plainbook/tables.xml
+++ b/plainbook/tables.xml
@@ -135,7 +135,7 @@ receive
 	constructor:
 	</p>
 	<code file="ruby/NinjaSurvivalRate/features/step_definitions/ninja_steps.rb" part="singletable" />		
- 	<p>See <url link="http://rdoc.info/github/aslakhellesoy/cucumber/master/Cucumber/Ast/Table" title="Cucumber AST Table API docs" /> on RDoc for more
+ 	<p>See <url link="http://rdoc.info/github/cucumber/cucumber/master/Cucumber/Ast/Table" title="Cucumber AST Table API docs" /> on RDoc for more
  	information on other table methods.</p>
  </section> 
  <section id="sec_java_tables" title="Reading tables in Java">
@@ -334,7 +334,7 @@ Before('@killer') do
   # only before scenarios tagged with @killer
 end
 </code>
-<p>For more information on scenario hooks in Ruby, see <url title="the hooks page in the Cukes wiki" link="http://github.com/aslakhellesoy/cucumber/wiki/Hooks" />.</p>
+<p>For more information on scenario hooks in Ruby, see <url title="the hooks page in the Cukes wiki" link="http://github.com/cucumber/cucumber/wiki/Hooks" />.</p>
 </section>
 <section title="Scenario hooks in Java">
 <p>You can define scenario hooks in Java using the <code>@Before</code> and <code>@After</code> annotations. For example:</p>
@@ -365,7 +365,7 @@ and list the relevant tags in the annotation. For example: </p>
  }
 </code>
 <img id="img.java_killer" title="Ninjas fall at Chuck's hand in Java" src="java-killer.png" />
-<p>For more information on scenario hooks in other JVM languages, see <url title="the hooks page in the Cuke4Duke wiki"  link="http://github.com/aslakhellesoy/cuke4duke/wiki/Hooks" />.</p>
+<p>For more information on scenario hooks in other JVM languages, see <url title="the hooks page in the Cuke4Duke wiki"  link="http://github.com/cucumber/cuke4duke/wiki/Hooks" />.</p>
 </section>
 <section title="Scenario hooks in .NET">
 <p>You can define scenario hooks in .NET using the <code>[Before]</code> and <code>[After]</code> attributes. For example:</p>
@@ -397,7 +397,7 @@ To avoid this problem, mark your scenarios with tags and list the relevant tags
 <p>The Ruby version of Cucumber (but not Cuke4Duke and Cuke4Nuke) supports many other types of hooks, such as step hooks
  (executed before or after each step) and global hooks (executed 
 once before any test runs or after all tests finish). They are defined similarly to the scenario hooks covered in this section. For more information, see
-<url title="the hooks page in the Cukes wiki" link="https://github.com/aslakhellesoy/cucumber/wiki/Hooks"/>.</p>
+<url title="the hooks page in the Cukes wiki" link="https://github.com/cucumber/cucumber/wiki/Hooks"/>.</p>
 </note>
 </section>
 </chapter>