diff --git a/net-wireless/hostapd/hostapd-2.6-r2.ebuild b/net-wireless/hostapd/hostapd-2.6-r2.ebuild
index 64d34bf0f89c3..250e07cfbe7b0 100644
--- a/net-wireless/hostapd/hostapd-2.6-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit toolchain-funcs eutils systemd
+inherit toolchain-funcs eutils systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://hostap.epitest.fi"
@@ -49,6 +49,12 @@ src_prepare() {
 src_configure() {
 	local CONFIG="${S}/.config"
 
+	restore_config "${CONFIG}"
+	if [[ -f "${CONFIG}" ]]; then
+		default_src_configure
+		return 0
+	fi
+
 	# toolchain setup
 	echo "CC = $(tc-getCC)" > ${CONFIG}
 
@@ -194,6 +200,8 @@ src_install() {
 		exeinto /etc/log.d/scripts/services/
 		doexe logwatch/${PN}
 	fi
+
+	save_config .config
 }
 
 pkg_postinst() {