MRV: Annoying bug with MRV voltage fixed

Originally committed by tomvanklinken, but his patch did more than I
wanted to commit, including re-writing an automake variable which I
wasn't happy about.

Nonetheless, thanks for the patch!