diff --git a/service/gitea.go b/service/gitea.go
index 4357006..c7c03fd 100644
--- a/service/gitea.go
+++ b/service/gitea.go
@@ -30,7 +30,7 @@ func (ge *Gitea) Generate() (string, []Entry, error) {
 
 	entries := make([]Entry, 0)
 
-	milestoneID, err := ge.milestoneID(client)
+	milestone, _, err := client.GetMilestoneByName(ge.Owner, ge.Repo, ge.Milestone)
 	if err != nil {
 		return "", nil, err
 	}
@@ -40,14 +40,10 @@ func (ge *Gitea) Generate() (string, []Entry, error) {
 		from = "issues"
 	}
 
-	tagURL := getGiteaTagURL(client, ge.BaseURL, ge.Owner, ge.Repo, ge.Milestone, from, milestoneID)
+	tagURL := getGiteaTagURL(client, ge.BaseURL, ge.Owner, ge.Repo, ge.Milestone, from, milestone.ID)
 
-	p := 1
-	// https://github.com/go-gitea/gitea/blob/d92781bf941972761177ac9e07441f8893758fd3/models/repo.go#L63
-	// https://github.com/go-gitea/gitea/blob/e3c3b33ea7a5a223e22688c3f0eb2d3dab9f991c/models/pull_list.go#L104
-	// FIXME Gitea has this hard-coded at 40
-	perPage := 40
-	for {
+	perPage := ge.perPage(client)
+	for p := 1; ; p++ {
 		options := gitea.ListIssueOption{
 			ListOptions: gitea.ListOptions{
 				Page:     p,
@@ -80,8 +76,6 @@ func (ge *Gitea) Generate() (string, []Entry, error) {
 		if len(issues) != perPage {
 			break
 		}
-
-		p++
 	}
 
 	return tagURL, entries, nil
@@ -121,26 +115,24 @@ func (ge *Gitea) Contributors() (ContributorList, error) {
 
 	contributorsMap := make(map[string]bool)
 
-	milestoneID, err := ge.milestoneID(client)
+	milestone, _, err := client.GetMilestoneByName(ge.Owner, ge.Repo, ge.Milestone)
 	if err != nil {
 		return nil, err
 	}
 
-	p := 1
-	perPage := 100
-	for {
+	perPage := ge.perPage(client)
+	for p := 1; ; p++ {
 		results, _, err := client.ListRepoPullRequests(ge.Owner, ge.Repo, gitea.ListPullRequestsOptions{
 			ListOptions: gitea.ListOptions{
 				Page:     p,
 				PageSize: perPage,
 			},
 			State:     "closed",
-			Milestone: milestoneID,
+			Milestone: milestone.ID,
 		})
 		if err != nil {
 			return nil, err
 		}
-		p++
 
 		for _, pr := range results {
 			if pr != nil && pr.HasMerged {
@@ -164,17 +156,15 @@ func (ge *Gitea) Contributors() (ContributorList, error) {
 	return contributors, nil
 }
 
-func (ge *Gitea) milestoneID(client *gitea.Client) (int64, error) {
-	milestones, _, err := client.ListRepoMilestones(ge.Owner, ge.Repo, gitea.ListMilestoneOption{State: gitea.StateAll})
-	if err != nil {
-		return 0, err
-	}
-
-	for _, ms := range milestones {
-		if ms.Title == ge.Milestone {
-			return ms.ID, nil
+func (ge *Gitea) perPage(client *gitea.Client) int {
+	// set low value so it will work in most cases
+	perPage := 10
+	if client.CheckServerVersionConstraint(">=1.13.0") == nil {
+		conf, _, err := client.GetGlobalAPISettings()
+		if err != nil {
+			return perPage
 		}
+		return conf.MaxResponseItems
 	}
-
-	return 0, fmt.Errorf("no milestone found for %s", ge.Milestone)
+	return perPage
 }