engine/class_modules/sc_mage.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engine/class_modules/sc_mage.cpp b/engine/class_modules/sc_mage.cpp
index bb59a99..d067fe2 100755
--- a/engine/class_modules/sc_mage.cpp
+++ b/engine/class_modules/sc_mage.cpp
@@ -342,6 +342,7 @@ public:
   timespan_t firestarter_time;
   int blessing_of_wisdom_count;
   bool allow_shimmer_lance;
+  timespan_t inferno_time;

   // Data collection
   auto_dispose<std::vector<cooldown_waste_data_t*> > cooldown_waste_data_list;
@@ -6838,6 +6839,7 @@ mage_t::mage_t( sim_t* sim, const std::string& name, race_e r ) :
   distance_from_rune( 0.0 ),
   global_cinder_count( 0.0 ),
   firestarter_time( timespan_t::zero() ),
+  inferno_time( timespan_t::zero() ),
   blessing_of_wisdom_count( 0 ),
   allow_shimmer_lance( false ),
   action( actions_t() ),
@@ -7085,6 +7087,7 @@ void mage_t::create_options()
   add_option( opt_timespan( "firestarter_time", firestarter_time ) );
   add_option( opt_int( "blessing_of_wisdom_count", blessing_of_wisdom_count ) );
   add_option( opt_bool( "allow_shimmer_lance", allow_shimmer_lance ) );
+  add_option( opt_timespan( "inferno_time", inferno_time ) );
   player_t::create_options();
 }

@@ -7117,6 +7120,7 @@ void mage_t::copy_from( player_t* source )
   firestarter_time          = p -> firestarter_time;
   blessing_of_wisdom_count  = p -> blessing_of_wisdom_count;
   allow_shimmer_lance       = p -> allow_shimmer_lance;
+  inferno_time				= p -> inferno_time;
 }

 // mage_t::merge =========================================================
@@ -8627,6 +8631,11 @@ void mage_t::combat_begin()
     uptime.burn_phase -> update( false, sim -> current_time() );
     uptime.conserve_phase -> update( true, sim -> current_time() );
   }
+
+  if ( inferno_time > timespan_t::zero() ) {
+	buffs.inferno -> buff_duration = inferno_time;
+	buffs.inferno -> trigger();
+  }
 }

 void mage_t::combat_end()