diff --git a/build.sbt b/build.sbt
new file mode 100644
index 0000000..ba50592
--- /dev/null
+++ b/build.sbt
@@ -0,0 +1,79 @@
+val Organization = "gitbucket"
+val Name = "gitbucket"
+val GitBucketVersion = "3.11.0-SNAPSHOT"
+val ScalatraVersion = "2.4.0"
+
+lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin)
+
+sourcesInBase := false
+organization := Organization
+name := Name
+version := GitBucketVersion
+scalaVersion := "2.11.6"
+
+// dependency settings
+resolvers ++= Seq(
+  Classpaths.typesafeReleases,
+  "amateras-repo" at "http://amateras.sourceforge.jp/mvn/",
+  "amateras-snapshot-repo" at "http://amateras.sourceforge.jp/mvn-snapshot/"
+)
+libraryDependencies ++= Seq(
+  "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.1.1.201511131810-r",
+  "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.1.1.201511131810-r",
+  "org.scalatra" %% "scalatra" % ScalatraVersion,
+  "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
+  "org.scalatra" %% "scalatra-json" % ScalatraVersion,
+  "org.specs2" %% "specs2-junit" % "3.6.6" % "test",
+  "org.json4s" %% "json4s-jackson" % "3.3.0",
+  "io.github.gitbucket" %% "scalatra-forms" % "1.0.0",
+  "commons-io" % "commons-io" % "2.4",
+  "io.github.gitbucket" % "markedj" % "1.0.6",
+  "org.apache.commons" % "commons-compress" % "1.10",
+  "org.apache.commons" % "commons-email" % "1.4",
+  "org.apache.httpcomponents" % "httpclient" % "4.5.1",
+  "org.apache.sshd" % "apache-sshd" % "1.0.0",
+  "org.apache.tika" % "tika-core" % "1.11",
+  "com.typesafe.slick" %% "slick" % "2.1.0",
+  "com.novell.ldap" % "jldap" % "2009-10-07",
+  "com.h2database" % "h2" % "1.4.190",
+  "ch.qos.logback" % "logback-classic" % "1.1.1",
+  "org.eclipse.jetty" % "jetty-webapp" % "9.3.6.v20151106" % "provided",
+  "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
+  "junit" % "junit" % "4.12" % "test",
+  "com.mchange" % "c3p0" % "0.9.5.2",
+  "com.typesafe" % "config" % "1.3.0",
+  "com.typesafe.akka" %% "akka-actor" % "2.3.14",
+  "com.enragedginger" %% "akka-quartz-scheduler" % "1.4.0-akka-2.3.x"  exclude("c3p0","c3p0")
+)
+
+// Twirl settings
+play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._"
+
+// Compiler settings
+scalacOptions := Seq("-deprecation", "-language:postfixOps")
+javacOptions in compile ++= Seq("-target", "7", "-source", "7")
+javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
+testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console")
+javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
+testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() )
+fork in Test := true
+packageOptions += Package.MainClass("JettyLauncher")
+
+// Assembly settings
+test in assembly := {}
+assemblyMergeStrategy in assembly := {
+  case PathList("META-INF", xs @ _*) =>
+    (xs map {_.toLowerCase}) match {
+      case ("manifest.mf" :: Nil) => MergeStrategy.discard
+      case _ => MergeStrategy.discard
+    }
+  case x => MergeStrategy.first
+}
+
+// JRebel
+jrebel.webLinks += (target in webappPrepare).value
+jrebel.enabled := System.getenv().get("JREBEL") != null
+javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
+  Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
+}
+jrebelSettings
diff --git a/project/build.scala b/project/build.scala
deleted file mode 100644
index f6d0d98..0000000
--- a/project/build.scala
+++ /dev/null
@@ -1,88 +0,0 @@
-import com.earldouglas.xwp.JettyPlugin
-import play.twirl.sbt.SbtTwirl
-import sbt.Keys._
-import sbt._
-import sbtassembly.AssemblyKeys._
-import sbtassembly._
-import JettyPlugin.autoImport._
-import fi.gekkio.sbtplugins.jrebel.JRebelPlugin._
-import com.earldouglas.xwp.WebappPlugin.autoImport.webappPrepare
-
-object MyBuild extends Build {
-  val Organization = "gitbucket"
-  val Name = "gitbucket"
-  val Version = "3.11.0-SNAPSHOT"
-  val ScalaVersion = "2.11.6"
-  val ScalatraVersion = "2.4.0"
-
-  lazy val project = Project (
-    "gitbucket",
-    file(".")
-  )
-//  .settings(ScalatraPlugin.scalatraWithJRebel: _*)
-  .settings(
-    test in assembly := {},
-    assemblyMergeStrategy in assembly := {
-      case PathList("META-INF", xs @ _*) =>
-        (xs map {_.toLowerCase}) match {
-          case ("manifest.mf" :: Nil) => MergeStrategy.discard
-          case _ => MergeStrategy.discard
-      }
-      case x => MergeStrategy.first
-    }
-  )
-  .settings(
-    sourcesInBase := false,
-    organization := Organization,
-    name := Name,
-    version := Version,
-    scalaVersion := ScalaVersion,
-    resolvers ++= Seq(
-      Classpaths.typesafeReleases,
-      "amateras-repo" at "http://amateras.sourceforge.jp/mvn/",
-      "amateras-snapshot-repo" at "http://amateras.sourceforge.jp/mvn-snapshot/"
-    ),
-    scalacOptions := Seq("-deprecation", "-language:postfixOps"),
-    libraryDependencies ++= Seq(
-      "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.1.1.201511131810-r",
-      "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.1.1.201511131810-r",
-      "org.scalatra" %% "scalatra" % ScalatraVersion,
-      "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
-      "org.scalatra" %% "scalatra-json" % ScalatraVersion,
-      "org.specs2" %% "specs2-junit" % "3.6.6" % "test",
-      "org.json4s" %% "json4s-jackson" % "3.3.0",
-      "io.github.gitbucket" %% "scalatra-forms" % "1.0.0",
-      "commons-io" % "commons-io" % "2.4",
-      "io.github.gitbucket" % "markedj" % "1.0.6",
-      "org.apache.commons" % "commons-compress" % "1.10",
-      "org.apache.commons" % "commons-email" % "1.4",
-      "org.apache.httpcomponents" % "httpclient" % "4.5.1",
-      "org.apache.sshd" % "apache-sshd" % "1.0.0",
-      "org.apache.tika" % "tika-core" % "1.11",
-      "com.typesafe.slick" %% "slick" % "2.1.0",
-      "com.novell.ldap" % "jldap" % "2009-10-07",
-      "com.h2database" % "h2" % "1.4.190",
-      "ch.qos.logback" % "logback-classic" % "1.1.1",
-      "org.eclipse.jetty" % "jetty-webapp" % "9.3.6.v20151106" % "provided",
-      "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
-      "junit" % "junit" % "4.12" % "test",
-      "com.mchange" % "c3p0" % "0.9.5.2",
-      "com.typesafe" % "config" % "1.3.0",
-      "com.typesafe.akka" %% "akka-actor" % "2.3.14",
-      "com.enragedginger" %% "akka-quartz-scheduler" % "1.4.0-akka-2.3.x"  exclude("c3p0","c3p0")
-    ),
-    play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._",
-    javacOptions in compile ++= Seq("-target", "7", "-source", "7"),
-    javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml",
-    testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console"),
-    javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test",
-    testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() ),
-    fork in Test := true,
-    packageOptions += Package.MainClass("JettyLauncher")
-  ).settings(jrebelSettings: _*).settings(
-    jrebel.webLinks += (target in webappPrepare).value,
-    jrebel.enabled := System.getenv().get("JREBEL") != null,
-    javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap(path =>
-      Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}"))
-  ).enablePlugins(SbtTwirl, JettyPlugin)
-}