diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index a8fc4ce..88c01b7 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -282,6 +282,12 @@
     helper.xml.feed(getActivitiesByUser(userName, true))
   }
 
+  get("/:userName.keys") {
+    val keys = getPublicKeys(params("userName"))
+    contentType = "text/plain; charset=utf-8"
+    keys.map(_.publicKey).mkString("\n")
+  }
+
   get("/:userName/_avatar") {
     val userName = params("userName")
     contentType = "image/png"