diff --git a/build.sbt b/build.sbt
index 29748eb7af..f56621cc40 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,9 +1,9 @@
 import Tests._
 
 val chisel6Version = "6.7.0"
-val chisel7Version = "7.0.0-RC4"
+val chisel7Version = "7.13.0"
 val chiselTestVersion = "6.0.0"
-val scalaVersionFromChisel = "2.13.16"
+val scalaVersionFromChisel = if (sys.env.contains("USE_CHISEL7")) "2.13.18" else "2.13.16"
 
 val chisel3Version = "3.6.1"
 
@@ -151,7 +151,13 @@ lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
   .settings(
     libraryDependencies ++= Seq(
       "com.lihaoyi" %% "mainargs" % "0.5.0",
-      "org.json4s" %% "json4s-jackson" % "4.0.5",
+      // Chisel 7+ needs a more recent version of json4s to avoid linking errors, and json4s
+      // migrated group ID at version 4.0.7.
+      if (sys.env.contains("USE_CHISEL7")) {
+        "io.github.json4s" %% "json4s-jackson" % "4.1.0"
+      } else {
+        "org.json4s" %% "json4s-jackson" % "4.0.5"
+      },
       "org.scala-graph" %% "graph-core" % "1.13.5"
     )
   )
diff --git a/common.mk b/common.mk
index 297b82aaa0..de111d17f4 100644
--- a/common.mk
+++ b/common.mk
@@ -203,6 +203,11 @@ MFC_BASE_LOWERING_OPTIONS ?= emittedLineLength=2048,noAlwaysComb,disallowLocalVa
 FIRTOOL_EXTRA_FLAGS ?=
 ifdef USE_CHISEL7
 FIRTOOL_EXTRA_FLAGS += --verification-flavor=if-else-fatal --disable-layers=Verification.Assume,Verification.Cover
+# Enable the Verification (for printf statements) and Assert (for assert statements) layers.
+VERIFICATION_LAYER_DIR = $(GEN_COLLATERAL_DIR)/verification
+ASSERT_LAYER_DIR = $(VERIFICATION_LAYER_DIR)/assert
+EXTRA_SIM_SOURCES += $(VERIFICATION_LAYER_DIR)/layers-$(MODEL)-Verification.sv $(ASSERT_LAYER_DIR)/layers-$(MODEL)-Verification-Assert.sv
+EXT_INCDIRS += $(VERIFICATION_LAYER_DIR) $(ASSERT_LAYER_DIR)
 endif
 
 # DOC include start: FirrtlCompiler