diff --git a/.scalafmt.conf b/.scalafmt.conf
index e4ab36511..5b87db3b7 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,6 +1,7 @@
+version = 2.0.0-RC5
 maxColumn = 100
 project.git = true
-project.excludeFilters = [ /sbt-test/, /input_sources/, /contraband-scala/ ]
+project.excludeFilters = [ "\\Wsbt-test\\W", "\\Winput_sources\\W", "\\Wcontraband-scala\\W" ]
 
 # http://docs.scala-lang.org/style/scaladoc.html recommends the JavaDoc style.
 # scala/scala is written that way too https://github.com/scala/scala/blob/v2.12.2/src/library/scala/Predef.scala
@@ -8,3 +9,5 @@ docstrings = JavaDoc
 
 # This also seems more idiomatic to include whitespace in import x.{ yyy }
 spaces.inImportCurlyBraces = true
+
+trailingCommas = preserve
diff --git a/.travis.yml b/.travis.yml
index 3233c1a4c..d6dc44b30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ scala:
 script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
   ++$TRAVIS_SCALA_VERSION
   mimaReportBinaryIssues
-  scalafmtCheck
+  scalafmtCheckAll
   whitesourceCheckPolicies
   test
 
diff --git a/project/build.properties b/project/build.properties
index 0cd8b0798..c0bab0494 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.3
+sbt.version=1.2.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8e37e2155..70d7318b3 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.9")
-addSbtPlugin("com.geirsson"   % "sbt-scalafmt" % "1.5.1")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1")
 addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.9")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")