diff --git a/README b/README
index e38e5544..f5c9686f 100644
--- a/README
+++ b/README
@@ -7,10 +7,10 @@
 **The new home for Tracks is https://github.com/TracksApp/tracks**
 
 * Project homepage: http://getontracks.org/
-* Manual: http://bsag.github.com/tracks/
-* Source at GitHub: http://github.com/bsag/tracks/
+* Manual: http://TracksApp.github.com/tracks/
+* Source at GitHub: http://github.com/TracksApp/tracks/
 * Assembla space (for bug reports and feature requests): http://www.assembla.com/spaces/tracks-tickets/tickets
-* Wiki (community contributed information): http://getontracks.org/wiki/
+* Wiki (community contributed information): https://github.com/tracksapp/tracks/wiki
 * Forum: http://getontracks.org/forums/
 * Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
 * Original developer: bsag (http://www.rousette.org.uk/)
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 75eb2c31..fd5e4769 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,20 +1,28 @@
 = Tracks: a GTD web application, built with Ruby on Rails
 
 * Project homepage: http://getontracks.org/
-* Manual: http://bsag.github.com/tracks/
-* Source at GitHub: http://github.com/bsag/tracks/
+* Manual: http://tracksapp.github.com/tracks/
+* Source at GitHub: http://github.com/tracksapp/tracks/
 * Assembla space (for bug reports and feature requests): http://www.assembla.com/spaces/tracks-tickets/tickets
-* Wiki (community contributed information): http://getontracks.org/wiki/
+* Wiki (community contributed information): https://github.com/tracksapp/tracks/wiki
 * Forum: http://getontracks.org/forums/
 * Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
 * Original developer: bsag (http://www.rousette.org.uk/)
-* Contributors: http://getontracks.org/wiki/Contributors
+* Contributors: https://github.com/tracksapp/tracks/wiki/Contributors
 * Version: 2.1devel
 * Copyright: (cc) 2004-2011 rousette.org.uk.
 * License:  GNU GPL
 
 == Version 2.1devel
 
+This version of tracks has moved to a new place on github. Also the wiki moved
+to github, see the changed URLs above
+
+New features:
+1. redesign of the completed todos: a new overview page. Also all context and
+   project pages have a link to their completed actions
+2. New locales (es and fr) and updated locales (de, nl)
+
 == Version 2.0
 
 New features:
@@ -35,7 +43,7 @@ New features:
 11.You can enable open signup (like in tracks.tra.in)
 12.Cleanup of context page
 13.Support for CAS for login
-14.Support for adding Tracks as a GMail Widget with instructions on the 
+14.Support for adding Tracks as a GMail Widget with instructions on the
    Integrations page
 15.Tracks now support internationalization. First translations are German and
    Dutch. See http://www.getontracks.org/wiki/Translating-Tracks it you like to
@@ -68,7 +76,7 @@ Under the hood:
 == Version 1.6
 1. upgrade to rails 2.0.2
 2. new mobile interface (with some iPhone compatibility fixes)
-3. new search functionality to search on todos, projects, contexts and notes 
+3. new search functionality to search on todos, projects, contexts and notes
 4. Bugfixes
 
 == Version 1.5
@@ -87,7 +95,7 @@ Under the hood:
 13. Add optional Default Context for a Project
 14. Add ability to sort projects alphabetically
 15. Add "starring" of actions
-16. Statistics page with graphs 
+16. Statistics page with graphs
 17. Rake task to set password. Usage: rake tracks:password USER=useranme
 
 == Version 1.041
@@ -116,7 +124,7 @@ Under the hood:
 10. The Completed Items box on the home, context and project pages now shows the same format for the actions as the Done page.
 11. The navigation bar now shows which page you are on by underlining the appropriate link and colouring the text black.
 12. There are new accesskeys for the notes page (alt/ctrl o) and user preferences (alt/ctrl u).
- 
+
 == Version 1.04
 
 1. Tidied up the interface a bit, fixing mistakes in the wording.
diff --git a/doc/README_DEVELOPERS b/doc/README_DEVELOPERS
index 771037d1..96c494ea 100644
--- a/doc/README_DEVELOPERS
+++ b/doc/README_DEVELOPERS
@@ -20,7 +20,7 @@ Install them using
 
 3. Wiki
 
-There are some pointers for setting up your Tracks copy for testing at http://www.getontracks.org/wiki/Testing/
+There are some pointers for setting up your Tracks copy for testing at https://github.com/tracksapp/tracks/wiki/Testing/
 
 4. SQLITE3 FOR TESTING
 
@@ -36,7 +36,7 @@ If you want to run tests using another database, that's fine, too. Just change y
 
 This testing style is deprecated and tests are being moved over to Selenium via Cucumber.
 
-See the wiki for more information to run the tests that are not yet migrated: http://www.getontracks.org/wiki/Testing
+See the wiki for more information to run the tests that are not yet migrated: https://github.com/tracksapp/tracks/wiki/Testing
 
 6. RSPEC tests
 
@@ -53,5 +53,5 @@ To run the cucumber test run
 and for those using javascript/ajax use
 
   rake cucumber:selenium
-  
-See the wiki for more information on testing: http://www.getontracks.org/wiki/Testing
\ No newline at end of file
+
+See the wiki for more information on testing: https://github.com/tracksapp/tracks/wiki/Testing
\ No newline at end of file