Hi Henning. I just applied & pushed your changes. I had to resolve some conflicts, so I wonder if you can take a look and make sure it still works as you expect. I tested it a bit and looks good. Thanks for your work on haddock support! I'm CCing the cabal-devel mailing list, are you on it? peace, isaac