Looks like security-openssh.diff was necessary after all...
Fixed www-firefox.diff patch.