diff --git a/firrtl b/firrtl
index 197760a9..a2af16c1 160000
--- a/firrtl
+++ b/firrtl
@@ -1 +1 @@
-Subproject commit 197760a962633d0e6140bcff16b96cc3d6b4e776
+Subproject commit a2af16c1fb1f5166eab34188df9944012da3cbc3
diff --git a/vsim/Makefrag b/vsim/Makefrag
index a2e3e5db..1a9f4c64 100644
--- a/vsim/Makefrag
+++ b/vsim/Makefrag
@@ -48,7 +48,10 @@ VCS_OPTS = -notice -line +lint=all,noVCDE,noONGS,noUI -error=PCWM-L -timescale=1
 	+define+CLOCK_PERIOD=1.0 $(sim_vsrcs) $(sim_csrcs) \
 	+define+PRINTF_COND=$(TB).printf_cond \
 	+define+STOP_COND=!$(TB).reset \
-	+define+RANDOMIZE \
+	+define+RANDOMIZE_MEM_INIT \
+	+define+RANDOMIZE_REG_INIT \
+	+define+RANDOMIZE_GARBAGE_ASSIGN \
+	+define+RANDOMIZE_INVALID_ASSIGN \
 	+libext+.v \
 
 VCS_OPTS += +vpi