Based on hvr's patches from http://wwwhephy.oeaw.ac.at/u3w/r/riedel/www/dns323/