diff --git a/pkg/hostapd/build b/pkg/hostapd/build
new file mode 100755
index 0000000..e0f4130
--- /dev/null
+++ b/pkg/hostapd/build
@@ -0,0 +1,35 @@
+VERSION="2.6"
+SRCDIR="hostapd-${VERSION}"
+TARBALL="${SRCDIR}.tar.gz"
+URL="https://w1.fi/releases/"
+SHA256SUM="01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d"
+DEPENDS="libnl3 openssl"
+
+prepare() {
+	return
+}
+
+build() {
+	cp -r ${1}/* ${PKGBUILDDIR}
+	cp "$SCRIPTDIR/pkg/$PKGNAME/config" "$PKGBUILDDIR/hostapd/.config"
+
+	export PKG_CONFIG_SYSROOT_DIR="$TCDIR/$TARGET"
+	make CC=${TARGET}-gcc -C hostapd -j $NUMJOBS
+}
+
+deploy() {
+	local SOURCE="$1"
+	local DEPLOY="$2"
+
+	mkdir -p "$DEPLOY/etc"
+	cat_file_override "hostapd.conf" > "$DEPLOY/etc/hostapd.conf"
+
+	make -C hostapd BINDIR=/bin DESTDIR="$DEPLOY" install
+	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
+}
+
+check_update() {
+	curl --silent -L "$URL" | grep -o ">hostapd-[0-9.]*tar.gz<" | \
+	    sed 's/>hostapd-//g' | sed 's/.tar.gz<//g' | \
+	    verson_find_greatest "$VERSION"
+}
diff --git a/pkg/hostapd/config b/pkg/hostapd/config
new file mode 100644
index 0000000..cf4423d
--- /dev/null
+++ b/pkg/hostapd/config
@@ -0,0 +1,47 @@
+CONFIG_DRIVER_HOSTAP=y
+CONFIG_DRIVER_NL80211=y
+CONFIG_LIBNL32=y
+CONFIG_DRIVER_NONE=y
+CONFIG_IAPP=y
+CONFIG_RSN_PREAUTH=y
+CONFIG_PEERKEY=y
+CONFIG_IEEE80211W=y
+CONFIG_EAP=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_MSCHAPV2=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_TTLS=y
+CONFIG_EAP_SIM=y
+CONFIG_EAP_AKA=y
+CONFIG_EAP_AKA_PRIME=y
+CONFIG_EAP_PAX=y
+CONFIG_EAP_PSK=y
+CONFIG_EAP_PWD=y
+CONFIG_EAP_SAKE=y
+CONFIG_EAP_GPSK=y
+CONFIG_EAP_GPSK_SHA256=y
+CONFIG_EAP_FAST=y
+CONFIG_WPS=y
+CONFIG_WPS_UPNP=y
+CONFIG_WPS_NFC=y
+CONFIG_EAP_IKEV2=y
+CONFIG_EAP_TNC=y
+CONFIG_EAP_EKE=y
+CONFIG_PKCS12=y
+CONFIG_RADIUS_SERVER=y
+CONFIG_IPV6=y
+CONFIG_IEEE80211R=y
+CONFIG_IEEE80211N=y
+CONFIG_WNM=y
+CONFIG_IEEE80211AC=y
+CONFIG_FULL_DYNAMIC_VLAN=y
+CONFIG_VLAN_NETLINK=y
+CONFIG_TLS=openssl
+CONFIG_TLSV11=y
+CONFIG_TLSV12=y
+CONFIG_INTERWORKING=y
+CONFIG_TESTING_OPTIONS=y
+CONFIG_ACS=y
+CONFIG_NO_STDOUT_DEBUG=y
diff --git a/pkg/hostapd/rootfs_files.txt b/pkg/hostapd/rootfs_files.txt
new file mode 100644
index 0000000..d7c394e
--- /dev/null
+++ b/pkg/hostapd/rootfs_files.txt
@@ -0,0 +1,3 @@
+bin/hostapd m 555 0 0
+bin/hostapd_cli m 555 0 0
+etc/hostapd.conf m 600 0 0