diff --git a/cgit.c b/cgit.c
index a0f88ad..7b55b7b 100644
--- a/cgit.c
+++ b/cgit.c
@@ -69,7 +69,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
 	if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
 		cgit_print_snapshot(item, cgit_query_sha1,
-				    cgit_repo->url, cgit_query_name);
+				    cgit_repobasename(cgit_repo->url),
+				    cgit_query_name);
 		return;
 	}
 
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 7076b50..053fd48 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -107,7 +107,7 @@ void cgit_print_snapshot_links(const char *repo,const char *hex)
 	int f;
     	for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
 		const struct snapshot_archive_t* sat = &snapshot_archives[f];
-		filename = fmt("%s-%s%s",repo,hex,sat->suffix);
+		filename = fmt("%s-%s%s",cgit_repobasename(repo),hex,sat->suffix);
 		htmlf("<a href='%s'>%s</a><br/>",
 			cgit_fileurl(repo,"snapshot",filename,
 			    fmt("id=%s&amp;name=%s",hex,filename)), filename);