diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index d0660fb80023..f6e43c699530 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -213,8 +213,12 @@ FILES+=		ftpd
 .endif
 
 .if ${MK_HAST} != "no"
-FILES+=		hastd
+FILESGROUPS+=	HAST
+HAST=		hastd
 .endif
+HASTDIR=	/etc/rc.d
+HASTMODE=	${BINMODE}
+HASTPACKAGE=	hast
 
 .if ${MK_INETD} != "no"
 FILES+=		inetd
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 982dc9902187..127da5dc05cd 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -40,6 +40,8 @@ gdb_COMMENT= 		GDB Utilities
 gdb_DESC= 		GDB Utilities
 groff_COMMENT= 		Groff Utilities
 groff_DESC= 		Groff Utilities
+hast_COMMENT= 		Highly Available Storage daemon
+hast_DESC= 		Highly Available Storage daemon
 jail_COMMENT= 		Jail Utilities
 jail_DESC= 		Jail Utilities
 kernel_COMMENT= 	FreeBSD Kernel
diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile
index 41d443d32783..a24b55e87f52 100644
--- a/sbin/hastctl/Makefile
+++ b/sbin/hastctl/Makefile
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=hast
 .PATH:	${.CURDIR}/../hastd
 
 PROG=	hastctl
diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile
index e3fed8d0b522..7ffebf9a4fa6 100644
--- a/sbin/hastd/Makefile
+++ b/sbin/hastd/Makefile
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=hast
 PROG=	hastd
 SRCS=	activemap.c
 SRCS+=	control.c crc32.c