diff --git a/fsm.go b/fsm.go
index ad0803488..4e48be15e 100644
--- a/fsm.go
+++ b/fsm.go
@@ -48,10 +48,14 @@ var fsmPlanners = []func(events []statemachine.Event, state *SectorInfo) error{
 	),
 	api.Committing: planCommitting,
 	api.CommitWait: planOne(
-		on(SectorProving{}, api.Proving),
+		on(SectorProving{}, api.FinalizeSector),
 		on(SectorCommitFailed{}, api.CommitFailed),
 	),
 
+	api.FinalizeSector: planOne(
+		on(SectorFinalized{}, api.Proving),
+	),
+
 	api.Proving: planOne(
 		on(SectorFaultReported{}, api.FaultReported),
 		on(SectorFaulty{}, api.Faulty),
@@ -150,6 +154,8 @@ func (m *Sealing) plan(events []statemachine.Event, state *SectorInfo) (func(sta
 		return m.handleCommitting, nil
 	case api.CommitWait:
 		return m.handleCommitWait, nil
+	case api.FinalizeSector:
+
 	case api.Proving:
 		// TODO: track sector health / expiration
 		log.Infof("Proving sector %d", state.SectorID)
diff --git a/fsm_events.go b/fsm_events.go
index ee4963750..84b1120c8 100644
--- a/fsm_events.go
+++ b/fsm_events.go
@@ -120,6 +120,14 @@ type SectorProving struct{}
 
 func (evt SectorProving) apply(*SectorInfo) {}
 
+type SectorFinalized struct{}
+
+func (evt SectorFinalized) apply(*SectorInfo) {}
+
+type SectorFinalizeFailed struct{ error }
+
+func (evt SectorFinalizeFailed) apply(*SectorInfo) {}
+
 // Failed state recovery
 
 type SectorRetrySeal struct{}
diff --git a/states.go b/states.go
index 519245e03..22a7f642b 100644
--- a/states.go
+++ b/states.go
@@ -232,6 +232,14 @@ func (m *Sealing) handleCommitWait(ctx statemachine.Context, sector SectorInfo)
 	return ctx.Send(SectorProving{})
 }
 
+func (m *Sealing) handleFinalizeSector(ctx statemachine.Context, sector SectorInfo) error {
+	if err := m.sb.FinalizeSector(ctx.Context(), sector.SectorID); err != nil {
+		return ctx.Send(SectorCommitFailed{err})
+	}
+
+	return ctx.Send(SectorFinalized{})
+}
+
 func (m *Sealing) handleFaulty(ctx statemachine.Context, sector SectorInfo) error {
 	// TODO: check if the fault has already been reported, and that this sector is even valid