diff --git a/lib/stack_master/change_set.rb b/lib/stack_master/change_set.rb
index b8605d27..b2c8dafd 100644
--- a/lib/stack_master/change_set.rb
+++ b/lib/stack_master/change_set.rb
@@ -68,8 +68,11 @@ def id
     private
 
     def display_resource_change(io, resource_change)
-      action_name = if resource_change.replacement == 'True'
+      action_name = case resource_change.replacement
+                    when 'True'
                       'Replace'
+                    when 'Conditional'
+                      'Conditional replace'
                     else
                       resource_change.action
                     end
@@ -86,6 +89,8 @@ def display_resource_change_detail(io, action_name, color, detail)
       detail_messages = [target_name]
       if action_name == 'Replace'
         detail_messages << "#{detail.target.requires_recreation} requires recreation"
+      elsif action_name == 'Conditional replace'
+        detail_messages << "#{detail.target.requires_recreation} may require recreation"
       end
       triggered_by = [detail.change_source, detail.causing_entity].compact.join('.')
       if detail.evaluation != 'Static'
@@ -101,7 +106,7 @@ def action_color(action_name)
         :green
       when 'Modify'
         :yellow
-      when 'Remove', 'Replace'
+      when 'Remove', 'Replace', 'Conditional replace'
         :red
       end
     end