diff --git a/.travis.yml b/.travis.yml
index 7b9d62d48..20ffdf8b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,7 @@ scala:
   - 2.12.2
 
 script:
-# drop scalafmt on the 1.0.0 branch to dogfood 1.0.0-RC2 before there is a sbt 1.0 of new-sbt-scalafnt
-# - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M ";++$TRAVIS_SCALA_VERSION test;scalafmt::test;test:scalafmt::test"
-  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M ";++$TRAVIS_SCALA_VERSION test"
+  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M ";++$TRAVIS_SCALA_VERSION test;scalafmt::test;test:scalafmt::test"
 
 cache:
   directories:
diff --git a/build.sbt b/build.sbt
index e249b949f..9fbe4fa00 100644
--- a/build.sbt
+++ b/build.sbt
@@ -41,9 +41,9 @@ lazy val lmRoot = (project in file("."))
           url("https://github.com/sbt/librarymanagement"), "git@github.com:sbt/librarymanagement.git"
         )),
         bintrayPackage := "librarymanagement",
-        // scalafmtOnCompile := true,
+        scalafmtOnCompile := true,
         // scalafmtVersion 1.0.0-RC3 has regression
-        // scalafmtVersion := "0.6.8",
+        scalafmtVersion := "0.6.8",
         git.baseVersion := baseVersion,
         version := {
           val v = version.value
diff --git a/project/build.properties b/project/build.properties
index c9e698a14..cd66fd542 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.0-RC2
+sbt.version=1.0.0-M6
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3023a6dc1..e5b186e6d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.3")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M9")
-
-// addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.3")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0")
+addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.3")
 
 scalacOptions += "-language:postfixOps"