diff --git a/cgit.c b/cgit.c
index 3299936..a8dda23 100644
--- a/cgit.c
+++ b/cgit.c
@@ -233,8 +233,8 @@
 		ctx.cfg.scan_hidden_path = atoi(value);
 	else if (!strcmp(name, "section-from-path"))
 		ctx.cfg.section_from_path = atoi(value);
-	else if (!strcmp(name, "section-sort"))
-		ctx.cfg.section_sort = xstrdup(value);
+	else if (!strcmp(name, "repository-sort"))
+		ctx.cfg.repository_sort = xstrdup(value);
 	else if (!strcmp(name, "source-filter"))
 		ctx.cfg.source_filter = new_filter(value, SOURCE);
 	else if (!strcmp(name, "summary-log"))
@@ -364,7 +364,7 @@
 	ctx->cfg.scan_hidden_path = 0;
 	ctx->cfg.script_name = CGIT_SCRIPT_NAME;
 	ctx->cfg.section = "";
-	ctx->cfg.section_sort = "name";
+	ctx->cfg.repository_sort = "name";
 	ctx->cfg.summary_branches = 10;
 	ctx->cfg.summary_log = 10;
 	ctx->cfg.summary_tags = 10;
diff --git a/cgit.h b/cgit.h
index 79ba7ad..8846e88 100644
--- a/cgit.h
+++ b/cgit.h
@@ -187,7 +187,7 @@
 	char *root_readme;
 	char *script_name;
 	char *section;
-	char *section_sort;
+	char *repository_sort;
 	char *virtual_root;
 	char *strict_export;
 	int cache_size;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 902fff3..7e1a93a 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -72,7 +72,7 @@
 
 case-sensitive-sort::
 	Sort items in the repo list case sensitively. Default value: "1".
-	See also: section-sort.
+	See also: repository-sort.
 
 clone-prefix::
 	Space-separated list of common prefixes which, when combined with a
@@ -337,7 +337,7 @@
 	after this option will inherit the current section name. Default value:
 	none.
 
-section-sort::
+repository-sort::
 	The way in which repositories in each section are sorted. Valid values
 	are "name" for sorting by the repo name or "age" for sorting by the
 	most recently updated repository. Default value: "name". See also:
diff --git a/ui-repolist.c b/ui-repolist.c
index 7e7f1fb..c774632 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -160,7 +160,7 @@
 
 	result = cmp(r1->section, r2->section);
 	if (!result) {
-		if (!strcmp(ctx.cfg.section_sort, "age")) {
+		if (!strcmp(ctx.cfg.repository_sort, "age")) {
 			// get_repo_modtime caches the value in r->mtime, so we don't
 			// have to worry about inefficiencies here.
 			if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t))