diff --git a/chisel3 b/chisel3
index 1b8f8485..54cd58cb 160000
--- a/chisel3
+++ b/chisel3
@@ -1 +1 @@
-Subproject commit 1b8f84859f2ac2d40085e6c31034dd598a5c6aad
+Subproject commit 54cd58cbb435170dd2ed67dafe1cb1d769a799e8
diff --git a/project/build.scala b/project/build.scala
index fb785745..9a23a338 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -15,7 +15,7 @@ object BuildSettings extends Build {
     libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
   )
 
-  lazy val chisel = project in file("chisel" + sys.env.getOrElse("CHISEL_VERSION", 2))
+  lazy val chisel = project in file("chisel" + sys.env.getOrElse("CHISEL_VERSION", 3))
   lazy val cde        = project in file("context-dependent-environments")
   lazy val hardfloat  = project.dependsOn(chisel)
   lazy val junctions  = project.dependsOn(chisel, cde)