diff --git a/ChangeLog b/ChangeLog
index 41f530506..5ddeff5f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,3 @@
 A summary of changes is available in the NEWS file. For a more 
 detailed Changelog, use the repository (see HACKING) or the
-online interface available at http://trac.strongswan.org.
+online interface available at http://git.strongswan.org.
diff --git a/NEWS b/NEWS
index 5a1d862e4..8bffb51a8 100644
--- a/NEWS
+++ b/NEWS
@@ -770,7 +770,7 @@ strongswan-4.1.7
 
 - Preview of strongSwan Manager, a web based configuration and monitoring
   application. It uses a new XML control interface to query the IKEv2 daemon
-  (see http://trac.strongswan.org/wiki/Manager).
+  (see http://wiki.strongswan.org/wiki/Manager).
 
 - Experimental SQLite configuration backend which will provide the configuration
   interface for strongSwan Manager in future releases.
diff --git a/TODO b/TODO
index c398ebab8..6b626e9ff 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,7 @@
 This is a TODO list we should keep in mind. A roadmap of the strongSwan
 project is available online at:
 
-             http://trac.strongswan.org/roadmap
+        http://wiki.strongswan.org/projects/strongswan/roadmap
 
 Certificate support
 -------------------