diff --git a/srcpkgs/hostapd/files/hostapd/run b/srcpkgs/hostapd/files/hostapd/run
new file mode 100644
index 00000000000..c010d1baf99
--- /dev/null
+++ b/srcpkgs/hostapd/files/hostapd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec hostapd -d /etc/hostapd/hostapd.conf 2>&1
diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index ed6681c9be3..3dac708f01a 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,8 +1,9 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.3
-revision=1
+revision=2
 build_wrksrc=${pkgname}
+build_options="systemd"
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel libressl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
@@ -21,7 +22,11 @@ do_build() {
 	make ${makejobs}
 }
 do_install() {
-	vinstall ${FILESDIR}/hostapd.service 644 usr/lib/systemd/system
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/hostapd.service 644 usr/lib/systemd/system
+	fi
+
+	vsv hostapd
 
 	vmkdir usr/bin
 	install -t ${DESTDIR}/usr/bin hostapd hostapd_cli
@@ -30,9 +35,10 @@ do_install() {
 	install -m644 -t ${DESTDIR}/usr/share/examples/hostapd \
 		hostapd.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} \
 		wired.conf hlr_auc_gw.milenage_db
-  
+
+	vinstall hostapd.conf 644 etc/hostapd
 	vinstall hostapd.8 644 usr/share/man/man8
 	vinstall hostapd_cli.1 644 usr/share/man/man1
 
-	vinstall ${wrksrc}/COPYING 644 usr/share/licenses/$pkgname LICENSE
+	vlicense ${wrksrc}/COPYING
 }