diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 704c3630a5d..a2188ad6414 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,43 +1,33 @@
 # Template file for 'hostapd'
 pkgname=hostapd
-version=2.1
+version=2.2
 revision=1
 build_wrksrc=${pkgname}
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel openssl-devel"
-conf_files="
-	/etc/hostapd/hostapd.conf
-	/etc/hostapd/hlr_auc_gw.milenage_db
-	/etc/hostapd/hostapd.accept
-	/etc/hostapd/hostapd.deny
-	/etc/hostapd/hostapd.eap_user
-	/etc/hostapd/hostapd.radius_clients
-	/etc/hostapd/hostapd.sim_db
-	/etc/hostapd/hostapd.vlan
-	/etc/hostapd/hostapd.wpa_psk
-	/etc/hostapd/wired.conf"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://w1.fi/hostapd/"
 distfiles="http://w1.fi/releases/${pkgname}-${version}.tar.gz"
-checksum=5c7110f55b6092e5277e26edc961eda2def12b94218129d116f5681e34bb2f88
+checksum=f15b6bcb434378860ea5b88dffed7f54d8cb71fff2146de0f006977a5e25a882
 
-do_build() {
+do_configure() {
 	cp -f ${FILESDIR}/config .config
 	sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
-	export CFLAGS="${CFLAGS} $(pkg-config --cflags libnl-3.0)"
+}
+do_build() {
+	export CFLAGS+=" $(pkg-config --cflags libnl-3.0)"
 	make ${makejobs}
 }
-
 do_install() {
 	vinstall ${FILESDIR}/hostapd.service 644 usr/lib/systemd/system
 
 	vmkdir usr/bin
 	install -t ${DESTDIR}/usr/bin hostapd hostapd_cli
 
-	vmkdir etc/hostapd
-	install -m644 -t ${DESTDIR}/etc/hostapd \
+	vmkdir usr/share/examples/hostapd
+	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