Handle custom strings appended after upstream versions.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>