diff --git a/index.html b/index.html
index b22d5f5..00a330b 100644
--- a/index.html
+++ b/index.html
@@ -86,7 +86,7 @@ permalink: /
 	<td class="col-md-8">
 		<a href="{{if url}}{{url}}{{else}}/{{name}}{{/if}}">{{name}}</a> 
 		{{if is_new}}<span class="label label-new">new</span>{{/if}}
-		{{if help}}<a href="/help/#{{name}}"><i class="fa fa-question-circle" title="Help"></i></a>{{/if}}
+		{{if help_url}}<a href="{{help_url}}"><i class="fa fa-question-circle" title="Help"></i></a>{{/if}}
 	</td>
 	<td class="col-md-4">
 	{{last_update}} {{if show_status}}<span class="label label-status {{label}} hidden-xs">{{status}}</span>{{/if}}
diff --git a/static/js/index.es6 b/static/js/index.es6
index 1c79c4f..d63e90e 100644
--- a/static/js/index.es6
+++ b/static/js/index.es6
@@ -31,7 +31,7 @@ var mir_tmpl = $("#template").text(),
 	],
 	options = {
 		'AOSP': {
-			'url': "/help/#AOSP",
+			'url': "/help/AOSP/",
 		}
 	};
 
@@ -47,7 +47,7 @@ window.refreshMirrorList = () => {
 				d = $.extend(d, options[d['name']]);
 			}
 			d['label'] = label_map[d['status']];
-			d['help'] = has_help[d['name']];
+			d['help_url'] = help_url[d['name']];
 			d['is_new'] = new_mirrors[d['name']];
 			d['show_status'] = (d.status != "success");
 			// Strip the second component of last_update