Add `port` back, fixes #883
Merge pull request #885 from Tjatse/master

Add `port` back, fixes #883