From: Brian Long <briandlong@gmail.com>

Split modifications from brilong-2.diff into separate diff files
and only apply them if respective files are present.