diff --git a/cmd/drone-server/flags.go b/cmd/drone-server/flags.go
index 127586e2f..965872169 100644
--- a/cmd/drone-server/flags.go
+++ b/cmd/drone-server/flags.go
@@ -306,6 +306,16 @@ var flags = []cli.Flag{
 		Usage:  "gitea server address",
 		Value:  "https://try.gitea.io",
 	},
+	cli.StringFlag{
+		EnvVar: "DRONE_GITEA_CLIENT,WOODPECKER_GITEA_CLIENT",
+		Name:   "gitea-client",
+		Usage:  "gitea oauth2 client id",
+	},
+	cli.StringFlag{
+		EnvVar: "DRONE_GITEA_SECRET,WOODPECKER_GITEA_SECRET",
+		Name:   "gitea-secret",
+		Usage:  "gitea oauth2 client secret",
+	},
 	cli.StringFlag{
 		EnvVar: "DRONE_GITEA_CONTEXT,WOODPECKER_GITEA_CONTEXT",
 		Name:   "gitea-context",
diff --git a/cmd/drone-server/setup.go b/cmd/drone-server/setup.go
index f94ccc0e9..ba32d064f 100644
--- a/cmd/drone-server/setup.go
+++ b/cmd/drone-server/setup.go
@@ -117,11 +117,23 @@ func setupGogs(c *cli.Context) (remote.Remote, error) {
 
 // helper function to setup the Gitea remote from the CLI arguments.
 func setupGitea(c *cli.Context) (remote.Remote, error) {
-	return gitea.New(gitea.Opts{
+	if !c.IsSet("gitea-client") {
+		return gitea.New(gitea.Opts{
+			URL:         c.String("gitea-server"),
+			Context:     c.String("gitea-context"),
+			Username:    c.String("gitea-git-username"),
+			Password:    c.String("gitea-git-password"),
+			PrivateMode: c.Bool("gitea-private-mode"),
+			SkipVerify:  c.Bool("gitea-skip-verify"),
+		})
+	}
+	return gitea.NewOauth(gitea.Opts{
 		URL:         c.String("gitea-server"),
 		Context:     c.String("gitea-context"),
 		Username:    c.String("gitea-git-username"),
 		Password:    c.String("gitea-git-password"),
+		Client:      c.String("gitea-client"),
+		Secret:      c.String("gitea-secret"),
 		PrivateMode: c.Bool("gitea-private-mode"),
 		SkipVerify:  c.Bool("gitea-skip-verify"),
 	})
diff --git a/remote/gitea/gitea.go b/remote/gitea/gitea.go
index c51aff5f5..a552dcf50 100644
--- a/remote/gitea/gitea.go
+++ b/remote/gitea/gitea.go
@@ -33,6 +33,8 @@ import (
 type Opts struct {
 	URL         string // Gitea server url.
 	Context     string // Context to display in status check
+	Client      string // OAuth2 Client ID
+	Secret      string // OAuth2 Client Secret
 	Username    string // Optional machine account username.
 	Password    string // Optional machine account password.
 	PrivateMode bool   // Gitea is running in private mode.
diff --git a/remote/gitea/gitea_oauth.go b/remote/gitea/gitea_oauth.go
new file mode 100644
index 000000000..fb93e92de
--- /dev/null
+++ b/remote/gitea/gitea_oauth.go
@@ -0,0 +1,389 @@
+// Copyright 2018 Drone.IO Inc.
+// Copyright 2021 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// This file has been modified by Informatyka Boguslawski sp. z o.o. sp.k.
+
+package gitea
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+
+	"code.gitea.io/sdk/gitea"
+	"github.com/woodpecker-ci/woodpecker/model"
+	"github.com/woodpecker-ci/woodpecker/remote"
+	"github.com/woodpecker-ci/woodpecker/shared/httputil"
+
+	"golang.org/x/oauth2"
+)
+
+const (
+	authorizeTokenURL = "%s/login/oauth/authorize"
+	accessTokenURL    = "%s/login/oauth/access_token"
+)
+
+type oauthclient struct {
+	URL         string
+	Context     string
+	Machine     string
+	Client      string
+	Secret      string
+	Username    string
+	Password    string
+	PrivateMode bool
+	SkipVerify  bool
+}
+
+// New returns a Remote implementation that integrates with Gitea, an open
+// source Git service written in Go. See https://gitea.io/
+func NewOauth(opts Opts) (remote.Remote, error) {
+	url, err := url.Parse(opts.URL)
+	if err != nil {
+		return nil, err
+	}
+	host, _, err := net.SplitHostPort(url.Host)
+	if err == nil {
+		url.Host = host
+	}
+	return &oauthclient{
+		URL:         opts.URL,
+		Context:     opts.Context,
+		Machine:     url.Host,
+		Client:      opts.Client,
+		Secret:      opts.Secret,
+		Username:    opts.Username,
+		Password:    opts.Password,
+		PrivateMode: opts.PrivateMode,
+		SkipVerify:  opts.SkipVerify,
+	}, nil
+}
+
+// Login authenticates an account with Gitea using basic authentication. The
+// Gitea account details are returned when the user is successfully authenticated.
+func (c *oauthclient) Login(w http.ResponseWriter, req *http.Request) (*model.User, error) {
+	redirect := httputil.GetURL(req)
+	config := &oauth2.Config{
+		ClientID:     c.Client,
+		ClientSecret: c.Secret,
+		Endpoint: oauth2.Endpoint{
+			AuthURL:  fmt.Sprintf(authorizeTokenURL, c.URL),
+			TokenURL: fmt.Sprintf(accessTokenURL, c.URL),
+		},
+		RedirectURL: fmt.Sprintf("%s/authorize", redirect),
+	}
+
+	// get the OAuth errors
+	if err := req.FormValue("error"); err != "" {
+		return nil, &remote.AuthError{
+			Err:         err,
+			Description: req.FormValue("error_description"),
+			URI:         req.FormValue("error_uri"),
+		}
+	}
+
+	// get the OAuth code
+	code := req.FormValue("code")
+	if len(code) == 0 {
+		http.Redirect(w, req, config.AuthCodeURL("drone"), http.StatusSeeOther)
+		return nil, nil
+	}
+
+	token, err := config.Exchange(oauth2.NoContext, code)
+	if err != nil {
+		return nil, err
+	}
+
+	client, err := c.newClientToken(token.AccessToken)
+	if err != nil {
+		return nil, err
+	}
+	account, _, err := client.GetMyUserInfo()
+	if err != nil {
+		return nil, err
+	}
+
+	return &model.User{
+		Token:  token.AccessToken,
+		Secret: token.RefreshToken,
+		Expiry: token.Expiry.UTC().Unix(),
+		Login:  account.UserName,
+		Email:  account.Email,
+		Avatar: expandAvatar(c.URL, account.AvatarURL),
+	}, nil
+}
+
+// Auth uses the Gitea oauth2 access token and refresh token to authenticate
+// a session and return the Gitea account login.
+func (c *oauthclient) Auth(token, secret string) (string, error) {
+	client, err := c.newClientToken(token)
+	if err != nil {
+		return "", err
+	}
+	user, _, err := client.GetMyUserInfo()
+	if err != nil {
+		return "", err
+	}
+	return user.UserName, nil
+}
+
+// Refresh refreshes the Gitea oauth2 access token. If the token is
+// refreshed the user is updated and a true value is returned.
+func (c *oauthclient) Refresh(user *model.User) (bool, error) {
+	config := &oauth2.Config{
+		ClientID:     c.Client,
+		ClientSecret: c.Secret,
+		Endpoint: oauth2.Endpoint{
+			AuthURL:  fmt.Sprintf(authorizeTokenURL, c.URL),
+			TokenURL: fmt.Sprintf(accessTokenURL, c.URL),
+		},
+	}
+	source := config.TokenSource(
+		oauth2.NoContext, &oauth2.Token{RefreshToken: user.Secret})
+
+	token, err := source.Token()
+	if err != nil || len(token.AccessToken) == 0 {
+		return false, err
+	}
+
+	user.Token = token.AccessToken
+	user.Secret = token.RefreshToken
+	user.Expiry = token.Expiry.UTC().Unix()
+	return true, nil
+}
+
+// Teams is supported by the Gitea driver.
+func (c *oauthclient) Teams(u *model.User) ([]*model.Team, error) {
+	client, err := c.newClientToken(u.Token)
+	if err != nil {
+		return nil, err
+	}
+
+	orgs, _, err := client.ListMyOrgs(gitea.ListOrgsOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	var teams []*model.Team
+	for _, org := range orgs {
+		teams = append(teams, toTeam(org, c.URL))
+	}
+	return teams, nil
+}
+
+// TeamPerm is not supported by the Gitea driver.
+func (c *oauthclient) TeamPerm(u *model.User, org string) (*model.Perm, error) {
+	return nil, nil
+}
+
+// Repo returns the named Gitea repository.
+func (c *oauthclient) Repo(u *model.User, owner, name string) (*model.Repo, error) {
+	client, err := c.newClientToken(u.Token)
+	if err != nil {
+		return nil, err
+	}
+
+	repo, _, err := client.GetRepo(owner, name)
+	if err != nil {
+		return nil, err
+	}
+	if c.PrivateMode {
+		repo.Private = true
+	}
+	return toRepo(repo, c.PrivateMode), nil
+}
+
+// Repos returns a list of all repositories for the Gitea account, including
+// organization repositories.
+func (c *oauthclient) Repos(u *model.User) ([]*model.Repo, error) {
+	repos := []*model.Repo{}
+
+	client, err := c.newClientToken(u.Token)
+	if err != nil {
+		return nil, err
+	}
+
+	// Gitea SDK forces us to read repo list paginated.
+	var page int = 1
+	for {
+		all, _, err := client.ListMyRepos(
+			gitea.ListReposOptions{
+				ListOptions: gitea.ListOptions{
+					Page:     page,
+					PageSize: 50, // Gitea SDK limit per page.
+				},
+			},
+		)
+
+		// Gitea SDK does not return error when asking for
+		// non existing repos page (empty list is returned)
+		// so this should be safe.
+		if err != nil {
+			return repos, err
+		}
+
+		for _, repo := range all {
+			repos = append(repos, toRepo(repo, c.PrivateMode))
+		}
+
+		// Check if no more repos are available; we don't test len(all) < 50
+		// because of Gitea SDK bug https://gitea.com/gitea/go-sdk/issues/507.
+		if len(all) == 0 {
+			// Empty page returned - finish loop.
+			break
+		} else {
+			// Last page was not empty so more repos may be available - continue loop.
+			page = page + 1
+		}
+	}
+
+	return repos, nil
+}
+
+// Perm returns the user permissions for the named Gitea repository.
+func (c *oauthclient) Perm(u *model.User, owner, name string) (*model.Perm, error) {
+	client, err := c.newClientToken(u.Token)
+	if err != nil {
+		return nil, err
+	}
+
+	repo, _, err := client.GetRepo(owner, name)
+	if err != nil {
+		return nil, err
+	}
+	return toPerm(repo.Permissions), nil
+}
+
+// File fetches the file from the Gitea repository and returns its contents.
+func (c *oauthclient) File(u *model.User, r *model.Repo, b *model.Build, f string) ([]byte, error) {
+	client, err := c.newClientToken(u.Token)
+	if err != nil {
+		return nil, err
+	}
+
+	cfg, _, err := client.GetFile(r.Owner, r.Name, b.Commit, f)
+	return cfg, err
+}
+
+func (c *oauthclient) Dir(u *model.User, r *model.Repo, b *model.Build, f string) ([]*remote.FileMeta, error) {
+	return nil, fmt.Errorf("Not implemented")
+}
+
+// Status is supported by the Gitea driver.
+func (c *oauthclient) Status(u *model.User, r *model.Repo, b *model.Build, link string, proc *model.Proc) error {
+	client, err := c.newClientToken(u.Token)
+	if err != nil {
+		return err
+	}
+
+	status := getStatus(b.Status)
+	desc := getDesc(b.Status)
+
+	_, _, err = client.CreateStatus(
+		r.Owner,
+		r.Name,
+		b.Commit,
+		gitea.CreateStatusOption{
+			State:       status,
+			TargetURL:   link,
+			Description: desc,
+			Context:     c.Context,
+		},
+	)
+
+	return err
+}
+
+// Netrc returns a netrc file capable of authenticating Gitea requests and
+// cloning Gitea repositories. The netrc will use the global machine account
+// when configured.
+func (c *oauthclient) Netrc(u *model.User, r *model.Repo) (*model.Netrc, error) {
+	if c.Password != "" {
+		return &model.Netrc{
+			Login:    c.Username,
+			Password: c.Password,
+			Machine:  c.Machine,
+		}, nil
+	}
+	return &model.Netrc{
+		Login:    u.Login,
+		Password: u.Token,
+		Machine:  c.Machine,
+	}, nil
+}
+
+// Activate activates the repository by registering post-commit hooks with
+// the Gitea repository.
+func (c *oauthclient) Activate(u *model.User, r *model.Repo, link string) error {
+	config := map[string]string{
+		"url":          link,
+		"secret":       r.Hash,
+		"content_type": "json",
+	}
+	hook := gitea.CreateHookOption{
+		Type:   "gitea",
+		Config: config,
+		Events: []string{"push", "create", "pull_request"},
+		Active: true,
+	}
+
+	client, err := c.newClientToken(u.Token)
+	if err != nil {
+		return err
+	}
+	_, _, err = client.CreateRepoHook(r.Owner, r.Name, hook)
+	return err
+}
+
+// Deactivate deactives the repository be removing repository push hooks from
+// the Gitea repository.
+func (c *oauthclient) Deactivate(u *model.User, r *model.Repo, link string) error {
+	client, err := c.newClientToken(u.Token)
+	if err != nil {
+		return err
+	}
+
+	hooks, _, err := client.ListRepoHooks(r.Owner, r.Name, gitea.ListHooksOptions{})
+	if err != nil {
+		return err
+	}
+
+	hook := matchingHooks(hooks, link)
+	if hook != nil {
+		_, err := client.DeleteRepoHook(r.Owner, r.Name, hook.ID)
+		return err
+	}
+
+	return nil
+}
+
+// Hook parses the incoming Gitea hook and returns the Repository and Build
+// details. If the hook is unsupported nil values are returned.
+func (c *oauthclient) Hook(r *http.Request) (*model.Repo, *model.Build, error) {
+	return parseHook(r)
+}
+
+// helper function to return the Gitea client with Token
+func (c *oauthclient) newClientToken(token string) (*gitea.Client, error) {
+	httpClient := &http.Client{}
+	if c.SkipVerify {
+		httpClient.Transport = &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		}
+	}
+	return gitea.NewClient(c.URL, gitea.SetToken(token), gitea.SetHTTPClient(httpClient))
+}