diff --git a/modules/auth/admin.go b/modules/auth/admin.go
index eccab007..fe889c23 100644
--- a/modules/auth/admin.go
+++ b/modules/auth/admin.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"reflect"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/binding"
 
diff --git a/modules/auth/auth.go b/modules/auth/auth.go
index 361f55b2..4561dd83 100644
--- a/modules/auth/auth.go
+++ b/modules/auth/auth.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/binding"
 
diff --git a/modules/auth/issue.go b/modules/auth/issue.go
index 8bf49684..36c87627 100644
--- a/modules/auth/issue.go
+++ b/modules/auth/issue.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"reflect"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/binding"
 
diff --git a/modules/auth/repo.go b/modules/auth/repo.go
index 2cc93744..eddd6475 100644
--- a/modules/auth/repo.go
+++ b/modules/auth/repo.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"reflect"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/binding"
 
diff --git a/modules/auth/setting.go b/modules/auth/setting.go
index 0bc6afd4..cada7eea 100644
--- a/modules/auth/setting.go
+++ b/modules/auth/setting.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/binding"
 
diff --git a/modules/auth/user.go b/modules/auth/user.go
index 6242a11c..2d3c29fd 100644
--- a/modules/auth/user.go
+++ b/modules/auth/user.go
@@ -8,11 +8,10 @@ import (
 	"net/http"
 	"reflect"
 
-	"github.com/codegangsta/martini"
-
-	"github.com/gogits/session"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/binding"
+	"github.com/gogits/session"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index f50fde99..bde3be72 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -7,7 +7,7 @@ package middleware
 import (
 	"net/url"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/modules/base"
 )
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 5f1d42b1..d2b268cd 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/cache"
 	"github.com/gogits/git"
diff --git a/modules/middleware/logger.go b/modules/middleware/logger.go
index dcf85246..fc8e1a81 100644
--- a/modules/middleware/logger.go
+++ b/modules/middleware/logger.go
@@ -11,7 +11,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 )
 
 var isWindows bool
diff --git a/modules/middleware/render.go b/modules/middleware/render.go
index 869ef9ab..98d485af 100644
--- a/modules/middleware/render.go
+++ b/modules/middleware/render.go
@@ -17,7 +17,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/modules/base"
 )
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 6912cd83..f446d6a8 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/git"
 
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index f303439f..18a43ff8 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
diff --git a/routers/admin/user.go b/routers/admin/user.go
index 7f66c552..9f043507 100644
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -7,7 +7,7 @@ package admin
 import (
 	"strings"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/routers/dev/template.go b/routers/dev/template.go
index d2f77ac4..63d5d9a5 100644
--- a/routers/dev/template.go
+++ b/routers/dev/template.go
@@ -5,7 +5,7 @@
 package dev
 
 import (
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
diff --git a/routers/install.go b/routers/install.go
index cca652f9..2c993c55 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/Unknwon/goconfig"
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 	"github.com/lunny/xorm"
 
 	"github.com/gogits/gogs/models"
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index c598db43..ffd118ae 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -5,7 +5,8 @@
 package repo
 
 import (
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
+
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/middleware"
 )
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 449f6443..d29c40e6 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -8,7 +8,7 @@ import (
 	"container/list"
 	"path"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index b2253e9f..f2d8959a 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 93b6a9f7..430c6a81 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -5,7 +5,7 @@
 package repo
 
 import (
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/modules/middleware"
 )
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 5b0a165d..1cd3dd86 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/webdav"
 
diff --git a/routers/user/user.go b/routers/user/user.go
index aeaf91c9..08930e22 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/web.go b/web.go
index 6f252719..412dcb62 100644
--- a/web.go
+++ b/web.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 
 	"github.com/codegangsta/cli"
-	"github.com/codegangsta/martini"
+	"github.com/go-martini/martini"
 
 	"github.com/gogits/binding"