Issue 11: Add support for 6.0-4.1