Included a patch from stsp@ that fixes SRV lookup (thanks). ok ajacoutot@, jasper@
- drop Simon from maintainer at his request thanks to viq for testing.