cgit

diff --git a/ui-tree.c b/ui-tree.c
index 3ff2320744b584464e196a25a66fed9be38ee64f..120066c425346f4b48d8061ed5f908da66138fc3 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -84,6 +84,37 @@ 	}
 	html("</table>\n");
 }
 
+static void set_title_from_path(const char *path)
+{
+	size_t path_len, path_index, path_last_end;
+	char *new_title;
+
+	if (!path)
+		return;
+
+	path_len = strlen(path);
+	new_title = xmalloc(path_len + 3 + strlen(ctx.page.title) + 1);
+	new_title[0] = '\0';
+
+	for (path_index = path_len, path_last_end = path_len; path_index-- > 0;) {
+		if (path[path_index] == '/') {
+			if (path_index == path_len - 1) {
+				path_last_end = path_index - 1;
+				continue;
+			}
+			strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1);
+			strcat(new_title, "\\");
+			path_last_end = path_index;
+		}
+	}
+	if (path_last_end)
+		strncat(new_title, path, path_last_end);
+
+	strcat(new_title, " - ");
+	strcat(new_title, ctx.page.title);
+	ctx.page.title = new_title;
+}
+
 static void print_object(const unsigned char *sha1, char *path, const char *basename, const char *rev)
 {
 	enum object_type type;
@@ -103,6 +134,8 @@ 		cgit_print_error_page(500, "Internal server error",
 			"Error reading object %s", sha1_to_hex(sha1));
 		return;
 	}
+
+	set_title_from_path(path);
 
 	cgit_print_layout_start();
 	htmlf("blob: %s (", sha1_to_hex(sha1));
@@ -235,6 +268,7 @@ 			return READ_TREE_RECURSIVE;
 
 		if (S_ISDIR(mode)) {
 			walk_tree_ctx->state = 1;
+			set_title_from_path(buffer);
 			ls_head();
 			return READ_TREE_RECURSIVE;
 		} else {