diff --git a/ui-shared.c b/ui-shared.c
index 7287956..03d147f 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -478,14 +478,20 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 	html("<table id='header'>\n");
 	html("<tr>\n");
 	html("<td class='logo' rowspan='2'><a href='");
-	html_attr(cgit_rooturl());
+	if (ctx->cfg.logo_link)
+		html_attr(ctx->cfg.logo_link);
+	else
+		html_attr(cgit_rooturl());
 	html("'><img src='");
 	html_attr(ctx->cfg.logo);
 	html("'/></a></td>\n");
 	html("<td class='main'>");
-	if (ctx->repo)
+	if (ctx->repo) {
+		html("<a href='");
+		html_attr(cgit_rooturl());
+		html("'>index</a> / ");
 		html_txt(ctx->repo->name);
-	else
+	} else
 		html_txt(ctx->cfg.root_title);
 	html("</td></tr>\n");
 	html("<tr><td class='sub'>");