Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -ra6737c3bcc8286c153b778c2c395f465e76aaafb -rdff17385da6583e18826af9d1b18c312d52be2f3
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision a6737c3bcc8286c153b778c2c395f465e76aaafb)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision dff17385da6583e18826af9d1b18c312d52be2f3)
@@ -24,6 +24,7 @@
 #include "OperationModes.h"
 #include "RinsePump.h"
 #include "SafetyShutdown.h"
+#include "SubstitutionPump.h"
 #include "Utilities.h"
 #include "Valves.h"
 
@@ -192,6 +193,14 @@
     setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D80_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D81_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D83_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D85_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D88_79_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D91_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D95_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D100_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize Balancing chamber and Ultrafiltration valves
     for ( i = FIRST_BC_VALVE; i <= LAST_BC_VALVE; i++ )
@@ -204,9 +213,12 @@
     requestConcentratePumpOff( D76_PUMP, parkPumps );
     signalDialysatePumpHardStop( D12_PUMP );
     signalDialysatePumpHardStop( D48_PUMP );
+    requestSubstitutionPumpOff( D92_PUMP );
     setRinsePumpState( RINSE_PUMP_STATE_OFF );
     stopHeater( D5_HEAT );
     stopHeater( D45_HEAT );
+    // TODO: Stop D108 substitution fluid heater once D108 driver support is implemented.
+    // stopHeater( D108_HEAT );
 }
 
 /*********************************************************************//**
@@ -241,6 +253,14 @@
     setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D80_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D81_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D83_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D85_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D88_79_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D91_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D95_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D100_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize portion of balancing chamber valves.
     setValveStateDelayed( D19_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
@@ -253,9 +273,12 @@
     requestConcentratePumpOff( D76_PUMP, parkPumps );
     signalDialysatePumpHardStop( D12_PUMP );
     signalDialysatePumpHardStop( D48_PUMP );
+    requestSubstitutionPumpOff( D92_PUMP );
     setRinsePumpState( RINSE_PUMP_STATE_OFF );
     stopHeater( D5_HEAT );
     stopHeater( D45_HEAT );
+    // TODO: Stop D108 substitution fluid heater once D108 driver support is implemented.
+    // stopHeater( D108_HEAT );
 }
 
 /*********************************************************************//**