diff --git a/build.sbt b/build.sbt
index 882136c2..aa42dd80 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,46 +1,51 @@
-organization := "edu.berkeley.cs"
+ThisBuild / organization := "edu.berkeley.cs"
+ThisBuild / version := "1.0-SNAPSHOT"
+ThisBuild / scalaVersion := "2.12.10"
+
+lazy val sifiveblocks = RootProject(uri("https://github.com/sifive/sifive-blocks.git"))
+
+lazy val root = (project in file "."))
+    .dependsOn(sifiveblocks)
+    .settings(
+      name := "testchipip",
+	  scalacOptions += "-Xsource:2.11",
+      libraryDependencies += "edu.berkeley.cs" %% "rocketchip" % "1.5-SNAPSHOT",
+
+      publishMavenStyle := true,
+
+      publishArtifact in Test := false,
+
+      pomIncludeRepository := { x => false },
+
+      pomExtra := <url>https://github.com/ucb-bar/testchipip</url>
+      <licenses>
+        <license>
+          <name>BSD-style</name>
+            <url>http://www.opensource.org/licenses/bsd-license.php</url>
+            <distribution>repo</distribution>
+          </license>
+        </licenses>
+        <scm>
+          <url>https://github.com/ucb-bar/testchipip.git</url>
+          <connection>scm:git:github.com/ucb-bar/testchipip.git</connection>
+        </scm>,
+
+      publishTo := {
+        val v = version.value
+        val nexus = "https://oss.sonatype.org/"
+        if (v.trim.endsWith("SNAPSHOT")) {
+          Some("snapshots" at nexus + "content/repositories/snapshots")
+        }
+        else {
+          Some("releases" at nexus + "service/local/staging/deploy/maven2")
+        }
+      },
+
+      resolvers ++= Seq(
+        Resolver.sonatypeRepo("snapshots"),
+        Resolver.sonatypeRepo("releases"),
+        Resolver.mavenLocal),
+    )
 
-version := "1.0-SNAPSHOT"
 
-name := "testchipip"
 
-scalaVersion := "2.12.10"
-
-scalacOptions += "-Xsource:2.11"
-
-libraryDependencies += "edu.berkeley.cs" %% "rocketchip" % "1.2.+"
-
-publishMavenStyle := true
-
-publishArtifact in Test := false
-
-pomIncludeRepository := { x => false }
-
-pomExtra := <url>https://github.com/ucb-bar/testchipip</url>
-<licenses>
-  <license>
-    <name>BSD-style</name>
-      <url>http://www.opensource.org/licenses/bsd-license.php</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://github.com/ucb-bar/testchipip.git</url>
-    <connection>scm:git:github.com/ucb-bar/testchipip.git</connection>
-  </scm>
-
-publishTo := {
-  val v = version.value
-  val nexus = "https://oss.sonatype.org/"
-  if (v.trim.endsWith("SNAPSHOT")) {
-    Some("snapshots" at nexus + "content/repositories/snapshots")
-  }
-  else {
-    Some("releases" at nexus + "service/local/staging/deploy/maven2")
-  }
-}
-
-resolvers ++= Seq(
-  Resolver.sonatypeRepo("snapshots"),
-  Resolver.sonatypeRepo("releases"),
-  Resolver.mavenLocal)
diff --git a/project/build.properties b/project/build.properties
index 0837f7a1..8b9a0b0a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.8.0