diff --git a/models/action.go b/models/action.go
index 6943802f0..055bc4b29 100644
--- a/models/action.go
+++ b/models/action.go
@@ -17,7 +17,7 @@ import (
 	"github.com/go-xorm/xorm"
 
 	"github.com/go-gitea/git"
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/base"
 	"github.com/go-gitea/gitea/modules/log"
diff --git a/models/issue.go b/models/issue.go
index be9eedcd2..b63ff48fe 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 	gouuid "github.com/satori/go.uuid"
 
 	"github.com/go-gitea/gitea/modules/base"
diff --git a/models/issue_comment.go b/models/issue_comment.go
index 1c615ab51..d75b42cd3 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -12,7 +12,7 @@ import (
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/markdown"
diff --git a/models/issue_label.go b/models/issue_label.go
index 0b9644c24..24d6bcac7 100644
--- a/models/issue_label.go
+++ b/models/issue_label.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/go-xorm/xorm"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/base"
 )
diff --git a/models/pull.go b/models/pull.go
index ae508103d..31d6589f1 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -18,7 +18,7 @@ import (
 	"github.com/go-gitea/gitea/modules/sync"
 	"github.com/go-xorm/xorm"
 	"github.com/go-gitea/git"
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 )
 
 var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
diff --git a/models/repo.go b/models/repo.go
index 6fa023633..6ae7d9a25 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -29,7 +29,7 @@ import (
 	"github.com/go-gitea/gitea/modules/sync"
 	"github.com/go-xorm/xorm"
 	"github.com/go-gitea/git"
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 	version "github.com/mcuadros/go-version"
 	ini "gopkg.in/ini.v1"
 )
diff --git a/models/user.go b/models/user.go
index d2e19eb17..ffa2f6440 100644
--- a/models/user.go
+++ b/models/user.go
@@ -25,7 +25,7 @@ import (
 	"github.com/nfnt/resize"
 
 	"github.com/go-gitea/git"
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/avatar"
 	"github.com/go-gitea/gitea/modules/base"
diff --git a/models/webhook.go b/models/webhook.go
index bb65dc096..3255f7904 100644
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -15,7 +15,7 @@ import (
 	"github.com/go-xorm/xorm"
 	gouuid "github.com/satori/go.uuid"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/httplib"
 	"github.com/go-gitea/gitea/modules/log"
diff --git a/models/webhook_slack.go b/models/webhook_slack.go
index 2ee401ee1..ddc2008a3 100644
--- a/models/webhook_slack.go
+++ b/models/webhook_slack.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/go-gitea/git"
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/setting"
 )
diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go
index 5e594e1e5..1deaa34b4 100644
--- a/routers/api/v1/admin/org.go
+++ b/routers/api/v1/admin/org.go
@@ -5,7 +5,7 @@
 package admin
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/admin/org_team.go b/routers/api/v1/admin/org_team.go
index 7a28d9566..2058ea002 100644
--- a/routers/api/v1/admin/org_team.go
+++ b/routers/api/v1/admin/org_team.go
@@ -5,7 +5,7 @@
 package admin
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go
index e673447c4..1ddf65c5e 100644
--- a/routers/api/v1/admin/repo.go
+++ b/routers/api/v1/admin/repo.go
@@ -5,7 +5,7 @@
 package admin
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/context"
 	"github.com/go-gitea/gitea/routers/api/v1/repo"
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
index b25c687d2..1234dbf0c 100644
--- a/routers/api/v1/admin/user.go
+++ b/routers/api/v1/admin/user.go
@@ -5,7 +5,7 @@
 package admin
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 2d468eae5..2deafa23c 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -10,7 +10,7 @@ import (
 	"github.com/go-macaron/binding"
 	"gopkg.in/macaron.v1"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"
diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go
index 94a918be4..a43e00077 100644
--- a/routers/api/v1/convert/convert.go
+++ b/routers/api/v1/convert/convert.go
@@ -10,7 +10,7 @@ import (
 	"github.com/Unknwon/com"
 
 	"github.com/go-gitea/git"
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 )
diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markdown.go
index 8ca5cde95..296f7faba 100644
--- a/routers/api/v1/misc/markdown.go
+++ b/routers/api/v1/misc/markdown.go
@@ -5,7 +5,7 @@
 package misc
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/context"
 	"github.com/go-gitea/gitea/modules/markdown"
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index 3f26f5510..98dc74ae7 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -5,7 +5,7 @@
 package org
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go
index 0c87ce26b..bb3c8f6fc 100644
--- a/routers/api/v1/org/team.go
+++ b/routers/api/v1/org/team.go
@@ -5,7 +5,7 @@
 package org
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/context"
 	"github.com/go-gitea/gitea/routers/api/v1/convert"
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
index f4327378d..06f51bc26 100644
--- a/routers/api/v1/repo/branch.go
+++ b/routers/api/v1/repo/branch.go
@@ -5,7 +5,7 @@
 package repo
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/modules/context"
 	"github.com/go-gitea/gitea/routers/api/v1/convert"
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index cfb211890..13cba4814 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -5,7 +5,7 @@
 package repo
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go
index 315172199..3d0bb80a7 100644
--- a/routers/api/v1/repo/hook.go
+++ b/routers/api/v1/repo/hook.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/Unknwon/com"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index 9193c0210..4e5369961 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go
index 71ce19fe3..28751008d 100644
--- a/routers/api/v1/repo/issue_comment.go
+++ b/routers/api/v1/repo/issue_comment.go
@@ -6,7 +6,7 @@ package repo
 import (
 	"time"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go
index 0d520a4f9..8f56afd61 100644
--- a/routers/api/v1/repo/issue_label.go
+++ b/routers/api/v1/repo/issue_label.go
@@ -5,7 +5,7 @@
 package repo
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go
index ec60bc516..adac6a6e6 100644
--- a/routers/api/v1/repo/key.go
+++ b/routers/api/v1/repo/key.go
@@ -7,7 +7,7 @@ package repo
 import (
 	"fmt"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go
index efa68b0a1..1e4f78f59 100644
--- a/routers/api/v1/repo/label.go
+++ b/routers/api/v1/repo/label.go
@@ -5,7 +5,7 @@
 package repo
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go
index 8913190f6..4e4b40ae9 100644
--- a/routers/api/v1/repo/milestone.go
+++ b/routers/api/v1/repo/milestone.go
@@ -7,7 +7,7 @@ package repo
 import (
 	"time"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index e6890ca33..0b28ee0f9 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -7,7 +7,7 @@ package repo
 import (
 	"path"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"
diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go
index 90b571dbb..0e8081f5f 100644
--- a/routers/api/v1/user/app.go
+++ b/routers/api/v1/user/app.go
@@ -5,7 +5,7 @@
 package user
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go
index 1643f2b0a..1667ee598 100644
--- a/routers/api/v1/user/email.go
+++ b/routers/api/v1/user/email.go
@@ -5,7 +5,7 @@
 package user
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go
index 0f0e7fcec..661bdcbce 100644
--- a/routers/api/v1/user/follower.go
+++ b/routers/api/v1/user/follower.go
@@ -5,7 +5,7 @@
 package user
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go
index ba4c1e1ee..316ebb65c 100644
--- a/routers/api/v1/user/key.go
+++ b/routers/api/v1/user/key.go
@@ -5,7 +5,7 @@
 package user
 
 import (
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index 6258662b6..e7322d725 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -7,7 +7,7 @@ package user
 import (
 	"github.com/Unknwon/com"
 
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
index aae3231b3..3cb6d1d27 100644
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -13,7 +13,7 @@ import (
 	"github.com/Unknwon/com"
 
 	"github.com/go-gitea/git"
-	api "github.com/gogits/go-gogs-client"
+	api "github.com/go-gitea/go-sdk/gitea"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"