diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js
index 83983e6793..da43664162 100644
--- a/docs/website/js/buildroot.js
+++ b/docs/website/js/buildroot.js
@@ -87,7 +87,7 @@ jQuery(document).ready(function($) {
     url = url.split(/[\\/]/).pop()
     $('.nav a[href="/' + url + '"]').parent().addClass('active');
 
-    load_activity("http://rss.gmane.org/topics/excerpts/gmane.comp.lib.uclibc.buildroot", "mailing-list-activity");
+    load_activity("http://buildroot-busybox.2317881.n4.nabble.com/Buildroot-busybox-ft2.xml", "mailing-list-activity");
     load_activity("http://git.buildroot.org/buildroot/atom/?h=master", "commit-activity");
 
     $('#slides').html('<iframe src="https://docs.google.com/gview?url=http://free-electrons.com/doc/training/buildroot/buildroot-slides.pdf&embedded=true" style="position:absolute; width:100%; height:100%; top:0; left:0;" frameborder="0"></iframe>')
diff --git a/docs/website/support.html b/docs/website/support.html
index 92ee03b02e..a1184c8b67 100644
--- a/docs/website/support.html
+++ b/docs/website/support.html
@@ -50,9 +50,11 @@
 		    list, since there is a good chance someone else has asked the same question
 		    before.</p>
 
-		  <form method="get" action="http://search.gmane.org/">
+		  <form method="get" action="http://buildroot-busybox.2317881.n4.nabble.com/template/NamlServlet.jtp">
 		    <input type="text" name="query">
-		    <input type="hidden" name="group" value="gmane.comp.lib.uclibc.buildroot">
+		    <input type="hidden" name="macro" value="search_page">
+		    <input type="hidden" name="node" value="2">
+		    <input type="hidden" name="sort" value="date">
 		    <button type="submit" class="btn btn-default">Submit</button>
 		  </form>
 		</div>