The obvious sundance #3 patch follows... cumulative to the sundance-1.04 base patch, and sundance #2 patch.