Applying patch from Luke Yelavich <themuso@ubuntu.com> to instead of mangling the...