diff --git a/cgit.c b/cgit.c
index 28bab8d..aee7ba3 100644
--- a/cgit.c
+++ b/cgit.c
@@ -107,8 +107,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
 	cgit_print_pageheader(cgit_query_page, show_search);
 
 	if (!strcmp(cgit_query_page, "log")) {
-		cgit_print_log(cgit_query_head, cgit_query_ofs, 100, 
-			       cgit_query_search);
+		cgit_print_log(cgit_query_head, cgit_query_ofs,
+			       cgit_max_commit_count, cgit_query_search);
 	} else if (!strcmp(cgit_query_page, "tree")) {
 		cgit_print_tree(cgit_query_sha1, cgit_query_path);
 	} else if (!strcmp(cgit_query_page, "commit")) {
diff --git a/cgit.h b/cgit.h
index 43de375..46f3173 100644
--- a/cgit.h
+++ b/cgit.h
@@ -87,6 +87,7 @@ extern int cgit_cache_static_ttl;
 extern int cgit_cache_max_create_time;
 
 extern int cgit_max_msg_len;
+extern int cgit_max_commit_count;
 
 extern char *cgit_repo_name;
 extern char *cgit_repo_desc;
diff --git a/cgitrc b/cgitrc
index f217b39..019781e 100644
--- a/cgitrc
+++ b/cgitrc
@@ -55,6 +55,10 @@
 #max-message-length=60
 
 
+## Number of commits per page in log view
+#max-commit-count=50
+
+
 ## Root of cached output
 #cache-root=/var/cache/cgit
 
diff --git a/shared.c b/shared.c
index 801f68d..ffecac8 100644
--- a/shared.c
+++ b/shared.c
@@ -30,6 +30,7 @@ int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 
 int cgit_max_msg_len = 60;
+int cgit_max_commit_count = 50;
 
 char *cgit_repo_name    = NULL;
 char *cgit_repo_desc    = NULL;
@@ -120,6 +121,8 @@ void cgit_global_config_cb(const char *name, const char *value)
 		cgit_cache_dynamic_ttl = atoi(value);
 	else if (!strcmp(name, "max-message-length"))
 		cgit_max_msg_len = atoi(value);
+	else if (!strcmp(name, "max-commit-count"))
+		cgit_max_commit_count = atoi(value);
 	else if (!strcmp(name, "repo.url"))
 		cgit_repo = add_repo(value);
 	else if (!strcmp(name, "repo.name"))