diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 67206387fd9..5261583e0fd 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -38,6 +38,8 @@ groff_COMMENT= 		Groff Utilities
 groff_DESC= 		Groff Utilities
 hast_COMMENT= 		Highly Available Storage daemon
 hast_DESC= 		Highly Available Storage daemon
+hostapd_COMMENT=	802.11 Access Point Daemon an Utilities
+hostapd_DESC=		802.11 Access Point Daemon an Utilities
 jail_COMMENT= 		Jail Utilities
 jail_DESC= 		Jail Utilities
 jail-debug_DESCR= 	Debugging Symbols
diff --git a/release/packages/hostapd.ucl b/release/packages/hostapd.ucl
new file mode 100644
index 00000000000..65b7e90f42f
--- /dev/null
+++ b/release/packages/hostapd.ucl
@@ -0,0 +1,23 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index eace6cb74d3..d5426d2f45d 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -10,6 +10,7 @@
 	${WPA_DISTDIR}/src/drivers \
 	${WPA_DISTDIR}/wpa_supplicant
 
+PACKAGE=	hostapd
 PROG=	hostapd
 SRCS=	accounting.c \
 	ap_config.c \
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile
index ad652333c75..eda50e222d2 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile
+++ b/usr.sbin/wpa/hostapd_cli/Makefile
@@ -4,6 +4,7 @@
 
 .PATH.c:${HOSTAPD_DISTDIR}
 
+PACKAGE=	hostapd
 PROG=	hostapd_cli
 SRCS=	cli.c common.c edit.c eloop.c hostapd_cli.c os_unix.c \
 	wpa_ctrl.c wpa_debug.c