Apply patch from RT-89030
fix for RT-84164
The name_from regex doesn't support any of the above. It expects the package name to be followed by optional whitespace then a semicolon.
Merge pull request #12 from kevindawson/RT-89030

Apply patch from RT-89030
Merge pull request #14 from kevindawson/RT-84164

fix for RT-84164