merge rhoegg change to support non-default ports