diff --git a/mail/mailhog/Makefile b/mail/mailhog/Makefile
index fd91f010684a..3d7b477975e9 100644
--- a/mail/mailhog/Makefile
+++ b/mail/mailhog/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	mailhog
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	mail devel
 
 MAINTAINER=	mops@punkt.de
 COMMENT=	MailHog development mail server
 WWW=		https://github.com/mailhog/MailHog
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		go
 USE_RC_SUBR=	mailhog
 USE_GITHUB=	yes
 GH_PROJECT=	MailHog
 GH_SUBDIR=	src/github.com/mailhog/MailHog
 GH_TUPLE=	gorilla:pat:64353c3:pat/vendor/github.com/gorilla/pat \
 		gorilla:context:8559d4a:context/vendor/github.com/gorilla/context \
 		gorilla:mux:91708ff:mux/vendor/github.com/gorilla/mux \
 		gorilla:websocket:78cf1bc:websocket/vendor/github.com/gorilla/websocket \
 		ian-kent:go-log:5731446:go_log/vendor/github.com/ian-kent/go-log \
 		ian-kent:goose:c3541ea:goose/vendor/github.com/ian-kent/goose \
 		ian-kent:envconf:c198099:envconf/vendor/github.com/ian-kent/envconf \
 		ian-kent:linkio:97566b8:linkio/vendor/github.com/ian-kent/linkio \
 		mailhog:data:v${DISTVERSION}:data/vendor/github.com/mailhog/data \
 		mailhog:http:v${DISTVERSION}:http/vendor/github.com/mailhog/http \
 		mailhog:mhsendmail:9e70164:mhsendmail/vendor/github.com/mailhog/mhsendmail \
 		mailhog:smtp:v${DISTVERSION}:smtp/vendor/github.com/mailhog/smtp \
 		mailhog:storage:v${DISTVERSION}:storage/vendor/github.com/mailhog/storage \
 		mailhog:MailHog-Server:v${DISTVERSION}:mailhog_server/vendor/github.com/mailhog/MailHog-Server \
 		mailhog:MailHog-UI:v${DISTVERSION}:mailhog_ui/vendor/github.com/mailhog/MailHog-UI \
 		t-k:fluent-logger-golang:0f8ec08:fluent_logger_golang/vendor/github.com/t-k/fluent-logger-golang \
 		tinylib:msgp:e818a18:msgp/vendor/github.com/tinylib/msgp \
 		philhofer:fwd:8be6da3:fwd/vendor/github.com/philhofer/fwd \
 		golang:crypto:eb4f295:crypto/vendor/golang.org/x/crypto \
 		go-mgo:mgo:a6b53ec:mgo/vendor/gopkg.in/mgo.v2
 
 GO_TARGET=	:mailhog
 
 PLIST_FILES=	bin/${PORTNAME}
 SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>
diff --git a/mail/mailhog/files/mailhog.in b/mail/mailhog/files/mailhog.in
index 1187e79eb67a..67e10b359d82 100644
--- a/mail/mailhog/files/mailhog.in
+++ b/mail/mailhog/files/mailhog.in
@@ -1,43 +1,46 @@
 #!/bin/sh
 
 # PROVIDE: mailhog
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # mailhog_enable (bool):	Set to NO by default.
 #				Set it to YES to enable mailhog.
 # mailhog_bind_addr (ipaddr):	Set to the address mailhog should listen on
 #				for incoming connections. 127.0.0.1 by default.
 # mailhog_smtp_port (int):	Port to listen on for SMTP. 1025 by default.
 # mailhog_api_port (int):	Port to listen on for API. 8025 by default.
 # mailhog_ui_port (int):	Port to listen on for UI. 8025 (same as API)
 #				by default.
 # mailhog_runtimeuser (string):	User mailhog should run as. 'nobody' by default.
+# mailhog_hostname (string):	Hostname to use for EHLO/HELO and message IDs.
+#                               mailhog.example.com by default.
 #
 # Please think twice before exposing this server to the Internet. This is an
 # insecure tool without any authentication specifically to aid development
 # and debugging. Use in controlled environments only is highly recommended.
 #
 
 . /etc/rc.subr
 
 name="mailhog"
 rcvar="mailhog_enable"
 pidfile="/var/run/${name}.pid"
 
 : ${mailhog_enable:="NO"}
 : ${mailhog_bind_addr:="127.0.0.1"}
 : ${mailhog_smtp_port:="1025"}
 : ${mailhog_api_port:="8025"}
 : ${mailhog_ui_port:="8025"}
 : ${mailhog_runtimeuser:="nobody"}
+: ${mailhog_hostname:="mailhog.example"}
 
 load_rc_config "${name}"
 
 command="/usr/sbin/daemon"
-command_args="-c -r -f -P ${pidfile} -u ${mailhog_runtimeuser} %%PREFIX%%/bin/${name} -api-bind-addr ${mailhog_bind_addr}:${mailhog_api_port} -ui-bind-addr ${mailhog_bind_addr}:${mailhog_ui_port} -smtp-bind-addr ${mailhog_bind_addr}:${mailhog_smtp_port}"
+command_args="-c -r -f -P ${pidfile} -u ${mailhog_runtimeuser} %%PREFIX%%/bin/${name} -api-bind-addr ${mailhog_bind_addr}:${mailhog_api_port} -ui-bind-addr ${mailhog_bind_addr}:${mailhog_ui_port} -smtp-bind-addr ${mailhog_bind_addr}:${mailhog_smtp_port} -hostname ${mailhog_hostname}"
 
 run_rc_command "$1"