diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index 7af49e677a..1dbf2cadcd 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -1,5 +1,8 @@
 import play.sbt.Play.autoImport._
 import sbt._, Keys._
+import com.typesafe.sbt.SbtScalariform
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
+import scalariform.formatter.preferences._
 
 object BuildSettings {
 
@@ -20,7 +23,13 @@ object BuildSettings {
     publishArtifact in (Compile, packageDoc) := false,
     // disable publishing the main sources jar
     publishArtifact in (Compile, packageSrc) := false
-  )
+  ) ++
+    SbtScalariform.scalariformSettings ++ Seq(
+      ScalariformKeys.preferences := ScalariformKeys.preferences.value
+        .setPreference(AlignSingleLineCaseStatements, true)
+        .setPreference(CompactControlReadability, true)
+        .setPreference(SpacesAroundMultiImports, true)
+        .setPreference(DanglingCloseParenthesis, Preserve))
 
   def defaultDeps = Seq(scalaz, scalalib, jodaTime, ws, java8compat)
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6a8deb5e3a..df5ada552f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,5 @@
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.6")
+
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")