Support >= R15B

Signed-off-by: Brian L. Troutwine <brian@troutwine.us>