Seperate the ports a little bit more. Patch was mostly provided by sunpoet.
mentioned in commit 023b4857