diff --git a/security/hitch/Makefile b/security/hitch/Makefile
index ad6c29354308..936fa68f41a1 100644
--- a/security/hitch/Makefile
+++ b/security/hitch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		hitch
 PORTVERSION=		1.4.8
+PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://hitch-tls.org/source/ \
 			ZI
diff --git a/security/hitch/files/hitch.in b/security/hitch/files/hitch.in
index 7b284d08c740..f393160da4f2 100644
--- a/security/hitch/files/hitch.in
+++ b/security/hitch/files/hitch.in
@@ -30,11 +30,11 @@ load_rc_config $name
 
 : ${hitch_enable="NO"}
 : ${hitch_config="%%PREFIX%%/etc/hitch.conf"}
-: ${hitch_user:=nobody}
-: ${hitch_group:=nobody}
+: ${hitch_huser:=nobody}
+: ${hitch_hgroup:=nobody}
 
 command="%%PREFIX%%/sbin/hitch"
-command_args="--daemon -u ${hitch_user} -g ${hitch_group} -s --config=${hitch_config}"
+command_args="--daemon -u ${hitch_huser} -g ${hitch_hgroup} -s --config=${hitch_config}"
 extra_commands=reload
 
 required_files=${hitch_config}