diff --git a/etc/circt.json b/etc/circt.json
index c59b060674..13bcc12f48 100644
--- a/etc/circt.json
+++ b/etc/circt.json
@@ -1,3 +1,3 @@
 {
-  "version": "firtool-1.95.1"
+  "version": "firtool-1.96.0"
 }
diff --git a/panamalib/src/FirtoolOptions.scala b/panamalib/src/FirtoolOptions.scala
index b2086f0f2f..27468181d2 100644
--- a/panamalib/src/FirtoolOptions.scala
+++ b/panamalib/src/FirtoolOptions.scala
@@ -25,7 +25,6 @@ case class DisableOptimization(value: Boolean) extends FirtoolOption
 case class DisableRandom(value: RandomKindEnum) extends FirtoolOption
 case class DisableUnknownAnnotations(value: Boolean) extends FirtoolOption
 case class VerificationFlavor(value: VerificationFlavorEnum) extends FirtoolOption
-case class EmitOmir(value: Boolean) extends FirtoolOption
 case class EmitSeparateAlwaysBlocks(value: Boolean) extends FirtoolOption
 case class EnableAnnotationWarning(value: Boolean) extends FirtoolOption
 case class EtcDisableInstanceExtraction(value: Boolean) extends FirtoolOption
@@ -38,7 +37,6 @@ case class IgnoreReadEnableMem(value: Boolean) extends FirtoolOption
 case class LowerAnnotationsNoRefTypePorts(value: Boolean) extends FirtoolOption
 case class LowerMemories(value: Boolean) extends FirtoolOption
 case class NoDedup(value: Boolean) extends FirtoolOption
-case class OmirOutFile(value: String) extends FirtoolOption
 case class OutputAnnotationFilename(value: String) extends FirtoolOption
 case class OutputFilename(value: String) extends FirtoolOption
 case class PreserveAggregate(value: PreserveAggregateModeEnum) extends FirtoolOption
diff --git a/panamalib/src/PanamaCIRCT.scala b/panamalib/src/PanamaCIRCT.scala
index a22daf5a2e..c78591f9df 100644
--- a/panamalib/src/PanamaCIRCT.scala
+++ b/panamalib/src/PanamaCIRCT.scala
@@ -321,10 +321,6 @@ class PanamaCIRCT {
     CAPI.circtFirtoolOptionsSetCompanionMode(options.get, value.get)
   def circtFirtoolOptionsSetDisableAggressiveMergeConnections(options: CirctFirtoolFirtoolOptions, value: Boolean) =
     CAPI.circtFirtoolOptionsSetDisableAggressiveMergeConnections(options.get, value)
-  def circtFirtoolOptionsSetEmitOmir(options: CirctFirtoolFirtoolOptions, value: Boolean) =
-    CAPI.circtFirtoolOptionsSetEmitOmir(options.get, value)
-  def circtFirtoolOptionsSetOmirOutFile(options: CirctFirtoolFirtoolOptions, value: String) =
-    CAPI.circtFirtoolOptionsSetOmirOutFile(options.get, newString(value).get)
   def circtFirtoolOptionsSetLowerMemories(options: CirctFirtoolFirtoolOptions, value: Boolean) =
     CAPI.circtFirtoolOptionsSetLowerMemories(options.get, value)
   def circtFirtoolOptionsSetBlackBoxRootPath(options: CirctFirtoolFirtoolOptions, value: String) =
diff --git a/panamalib/src/PanamaFirtoolOption.scala b/panamalib/src/PanamaFirtoolOption.scala
index 63d0b7c5db..5ae373da97 100644
--- a/panamalib/src/PanamaFirtoolOption.scala
+++ b/panamalib/src/PanamaFirtoolOption.scala
@@ -25,7 +25,6 @@ object PanamaFirtoolOption {
       case DisableRandom(value: RandomKindEnum) => panamaCIRCT.circtFirtoolOptionsSetDisableRandom(options, value)
       case DisableUnknownAnnotations(value: Boolean) => panamaCIRCT.circtFirtoolOptionsSetDisableUnknownAnnotations(options, value)
       case VerificationFlavor(value: VerificationFlavorEnum) => panamaCIRCT.circtFirtoolOptionsSetVerificationFlavor(options, value)
-      case EmitOmir(value: Boolean) => panamaCIRCT.circtFirtoolOptionsSetEmitOmir(options, value)
       case EmitSeparateAlwaysBlocks(value: Boolean) => panamaCIRCT.circtFirtoolOptionsSetEmitSeparateAlwaysBlocks(options, value)
       case EnableAnnotationWarning(value: Boolean) => panamaCIRCT.circtFirtoolOptionsSetEnableAnnotationWarning(options, value)
       case EtcDisableInstanceExtraction(value: Boolean) => panamaCIRCT.circtFirtoolOptionsSetEtcDisableInstanceExtraction(options, value)
@@ -38,7 +37,6 @@ object PanamaFirtoolOption {
       case LowerAnnotationsNoRefTypePorts(value: Boolean) => panamaCIRCT.circtFirtoolOptionsSetLowerAnnotationsNoRefTypePorts(options, value)
       case LowerMemories(value: Boolean) => panamaCIRCT.circtFirtoolOptionsSetLowerMemories(options, value)
       case NoDedup(value: Boolean) => panamaCIRCT.circtFirtoolOptionsSetNoDedup(options, value)
-      case OmirOutFile(value: String) => panamaCIRCT.circtFirtoolOptionsSetOmirOutFile(options, value)
       case OutputAnnotationFilename(value: String) => panamaCIRCT.circtFirtoolOptionsSetOutputAnnotationFilename(options, value)
       case OutputFilename(value: String) => panamaCIRCT.circtFirtoolOptionsSetOutputFilename(options, value)
       case PreserveAggregate(value: PreserveAggregateModeEnum) => panamaCIRCT.circtFirtoolOptionsSetPreserveAggregate(options, value)