diff --git a/models/repo.go b/models/repo.go
index 527b7a91d..6a0071ef9 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gogits/gogs/utils/log"
 	git "github.com/libgit2/git2go"
-	"github.com/qiniu/log"
 )
 
 type Repo struct {
diff --git a/routers/user/ssh.go b/routers/user/ssh.go
new file mode 100644
index 000000000..84f41150f
--- /dev/null
+++ b/routers/user/ssh.go
@@ -0,0 +1,29 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package user
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/martini-contrib/render"
+
+	"github.com/gogits/gogs/models"
+)
+
+func AddPublickKey(req *http.Request, r render.Render) {
+	if req.Method == "GET" {
+		r.HTML(200, "user/publickey_add", map[string]interface{}{
+			"Title": "Add Public Key",
+		})
+		return
+	}
+
+	k := &models.PublicKey{}
+	err := models.AddPublicKey(k, "")
+	r.HTML(403, "status/403", map[string]interface{}{
+		"Title": fmt.Sprintf("%v", err),
+	})
+}
diff --git a/templates/user/publickey_add.tmpl b/templates/user/publickey_add.tmpl
new file mode 100644
index 000000000..2d70d82a3
--- /dev/null
+++ b/templates/user/publickey_add.tmpl
@@ -0,0 +1,26 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div class="container">
+	<form action="/user/delete" method="post" class="form-horizontal">
+		<div class="form-group">
+			<label class="col-md-4 control-label">Name of this public key: </label>
+			<div class="col-md-3">
+				<input name="keyname" class="form-control" placeholder="Type your preferred name">
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="col-md-4 control-label">Paste your key here: </label>
+			<div class="col-md-3">
+				<textarea name="key_content" cols="30" rows="10" class="form-control"></textarea>
+			</div>
+		</div>
+
+		<div class="form-group">
+		    <div class="col-md-offset-4 col-md-3">
+		    	<button type="submit" class="btn btn-info">Add public key</button>
+		    </div>
+		</div>
+	</form>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/web.go b/web.go
index 1d36e8a17..024a80f91 100644
--- a/web.go
+++ b/web.go
@@ -51,6 +51,7 @@ func runWeb(*cli.Context) {
 	m.Get("/user/signin", user.SignIn)
 	m.Any("/user/signup", user.SignUp)
 	m.Any("/user/delete", user.Delete)
+	m.Any("/user/publickey/add", user.AddPublickKey)
 	m.Any("/repo/create", repo.Create)
 	m.Any("/repo/delete", repo.Delete)