diff --git a/docs/docs.html b/docs/docs.html
index 77047b90c5..9ddc05967b 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -34,7 +34,7 @@ help:</p>
   <li>On the <a href="irc://freenode.net/#buildroot">Buildroot IRC
   channel</a>, <code>#buildroot</code> on Freenode</li>
 
-  <li>On our <a href="https://bugs.uclibc.org">bugtracker</a>.</li>
+  <li>On our <a href="https://bugs.buildroot.org">bugtracker</a>.</li>
 
   <li>Through the various companies offering commercial Buildroot
   support.</li>
diff --git a/docs/js/buildroot.js b/docs/js/buildroot.js
index 410b703150..55e5eb3ca9 100644
--- a/docs/js/buildroot.js
+++ b/docs/js/buildroot.js
@@ -36,7 +36,7 @@ function load_activity(feedurl, divid) {
 
 function initialize() {
   load_activity("http://rss.gmane.org/topics/excerpts/gmane.comp.lib.uclibc.buildroot", "mailing-list-activity");
-  load_activity("http://git.uclibc.org/buildroot/atom/?h=master", "commit-activity");
+  load_activity("http://git.buildroot.org/buildroot/atom/?h=master", "commit-activity");
 }
 
 function google_analytics() {
diff --git a/docs/support.html b/docs/support.html
index 4cc493247d..70f5829ef6 100644
--- a/docs/support.html
+++ b/docs/support.html
@@ -37,7 +37,7 @@ list with frequently asked questions...
 
 <h3>Bug Tracker</h3>
 
-If you encounter any problems while using Buildroot, you can use the <a href="https://bugs.uclibc.org/">Bug Tracker</a>
+If you encounter any problems while using Buildroot, you can use the <a href="https://bugs.buildroot.org/">Bug Tracker</a>
 to post your bugs and/or participate to find solutions to existing problems.
 
 Note: Patch are only accepted through the mailing list.