Add in rump of Colin Watson's patch (Closes: #680935)