diff --git a/cmd/web.go b/cmd/web.go
index 126a86a35..9881a76cc 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -514,8 +514,8 @@ func runWeb(ctx *cli.Context) {
 		m.Get("/labels/", repo.RetrieveLabels, repo.Labels)
 		m.Get("/milestones", repo.Milestones)
 		m.Get("/branches", repo.Branches)
-		m.Get("/stars/?:index", middleware.RepoRef(), repo.Stars)
-		m.Get("/watchers/?:index", middleware.RepoRef(), repo.Watchers)
+		m.Get("/stars", middleware.RepoRef(), repo.Stars)
+		m.Get("/watchers", middleware.RepoRef(), repo.Watchers)
 		m.Get("/forks", middleware.RepoRef(), repo.Forks)
 		m.Get("/archive/*", repo.Download)
 
diff --git a/models/repo.go b/models/repo.go
index fc155fa5f..d70454fc1 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -48,7 +48,7 @@ var (
 	Gitignores, Licenses, Readmes []string
 
 	// Maximum items per page in forks, watchers and stars of a repo
-	ItemsPerPage = 3
+	ItemsPerPage = 54
 )
 
 func LoadRepoConfig() {
diff --git a/routers/repo/stars.go b/routers/repo/stars.go
index ffccd1765..93854886c 100644
--- a/routers/repo/stars.go
+++ b/routers/repo/stars.go
@@ -19,21 +19,21 @@ const (
 func Stars(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("repos.stars")
 
-	page := ctx.ParamsInt(":index")
+	page := ctx.QueryInt("page")
 	if page <= 0 {
 		page = 1
 	}
 
 	ctx.Data["Page"] = paginater.New(ctx.Repo.Repository.NumStars, models.ItemsPerPage, page, 5)
 
-	stars, err := ctx.Repo.Repository.GetStars(ctx.ParamsInt(":index"))
+	stars, err := ctx.Repo.Repository.GetStars(ctx.QueryInt("page"))
 
 	if err != nil {
 		ctx.Handle(500, "GetStars", err)
 		return
 	}
 
-	if (ctx.ParamsInt(":index")-1)*models.ItemsPerPage > ctx.Repo.Repository.NumStars {
+	if (ctx.QueryInt("page")-1)*models.ItemsPerPage > ctx.Repo.Repository.NumStars {
 		ctx.Handle(404, "ctx.Repo.Repository.NumStars", nil)
 		return
 	}
diff --git a/routers/repo/watchers.go b/routers/repo/watchers.go
index 8765b1837..8626fa237 100644
--- a/routers/repo/watchers.go
+++ b/routers/repo/watchers.go
@@ -19,21 +19,21 @@ const (
 func Watchers(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("repos.watches")
 
-	page := ctx.ParamsInt(":index")
+	page := ctx.QueryInt("page")
 	if page <= 0 {
 		page = 1
 	}
 
 	ctx.Data["Page"] = paginater.New(ctx.Repo.Repository.NumWatches, models.ItemsPerPage, page, 5)
 
-	watchers, err := ctx.Repo.Repository.GetWatchers(ctx.ParamsInt(":index"))
+	watchers, err := ctx.Repo.Repository.GetWatchers(ctx.QueryInt("page"))
 
 	if err != nil {
 		ctx.Handle(500, "GetWatchers", err)
 		return
 	}
 
-	if (ctx.ParamsInt(":index")-1)*models.ItemsPerPage > ctx.Repo.Repository.NumWatches {
+	if (ctx.QueryInt("page")-1)*models.ItemsPerPage > ctx.Repo.Repository.NumWatches {
 		ctx.Handle(404, "ctx.Repo.Repository.NumWatches", nil)
 		return
 	}
diff --git a/templates/repo/stars.tmpl b/templates/repo/stars.tmpl
index 8ac67f5c5..af3193dcf 100644
--- a/templates/repo/stars.tmpl
+++ b/templates/repo/stars.tmpl
@@ -35,19 +35,19 @@
                 {{if gt .TotalPages 1}}
                 <div class="pagination">
                     {{if .HasPrevious}}
-                    <a href="{{$.RepoLink}}/stars/{{.Previous}}">{{$.i18n.Tr "issues.previous"}}</a>
+                    <a href="{{$.RepoLink}}/stars?page={{.Previous}}">{{$.i18n.Tr "issues.previous"}}</a>
                     {{end}}
 
                     {{range .Pages}}
                     {{if eq .Num -1}}
                     <a class="disabled item">...</a>
                     {{else}}
-                    <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.RepoLink}}/stars/{{.Num}}"{{end}}>{{.Num}}</a>
+                    <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.RepoLink}}/stars?page={{.Num}}"{{end}}>{{.Num}}</a>
                     {{end}}
                     {{end}}
 
                     {{if .HasNext}}
-                    <a href="{{$.RepoLink}}/stars/{{.Next}}">{{$.i18n.Tr "issues.next"}}</a>
+                    <a href="{{$.RepoLink}}/stars?page={{.Next}}">{{$.i18n.Tr "issues.next"}}</a>
                     {{end}}
                 </div>
                 {{end}}
diff --git a/templates/repo/watchers.tmpl b/templates/repo/watchers.tmpl
index f02b20130..03aba0e9a 100644
--- a/templates/repo/watchers.tmpl
+++ b/templates/repo/watchers.tmpl
@@ -35,19 +35,19 @@
                 {{if gt .TotalPages 1}}
                 <div class="pagination">
                     {{if .HasPrevious}}
-                    <a href="{{$.RepoLink}}/watchers/{{.Previous}}">{{$.i18n.Tr "issues.previous"}}</a>
+                    <a href="{{$.RepoLink}}/watchers?page={{.Previous}}">{{$.i18n.Tr "issues.previous"}}</a>
                     {{end}}
 
                     {{range .Pages}}
                     {{if eq .Num -1}}
                     <a class="disabled item">...</a>
                     {{else}}
-                    <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.RepoLink}}/watchers/{{.Num}}"{{end}}>{{.Num}}</a>
+                    <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.RepoLink}}/watchers?page={{.Num}}"{{end}}>{{.Num}}</a>
                     {{end}}
                     {{end}}
 
                     {{if .HasNext}}
-                    <a href="{{$.RepoLink}}/watchers/{{.Next}}">{{$.i18n.Tr "issues.next"}}</a>
+                    <a href="{{$.RepoLink}}/watchers?page={{.Next}}">{{$.i18n.Tr "issues.next"}}</a>
                     {{end}}
                 </div>
                 {{end}}