diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index bb40021cf..0abbf6d6e 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -73,6 +73,7 @@ $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
 $wlanapsettings{'DRIVER'} = 'NL80211';
 $wlanapsettings{'HTCAPS'} = '';
+$wlanapsettings{'VHTCAPS'} = '';
 
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 &Header::getcgihash(\%wlanapsettings);
@@ -389,6 +390,7 @@ print<<END
 		<option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option>
 		<option value='an' $selected{'HW_MODE'}{'an'}>802.11an</option>
 		<option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option>
+		<option value='ac' $selected{'HW_MODE'}{'ac'}>802.11ac</option>
 	</select>
 </td></tr>
 END
@@ -428,6 +430,7 @@ END
 ;
 print <<END
 <tr><td width='25%' class='base'>HT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
+<tr><td width='25%' class='base'>VHT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='VHTCAPS' size='30' value='$wlanapsettings{'VHTCAPS'}' /></td></tr>
 <tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'><input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>
 <tr><td width='25%' class='base'>Loglevel (hostapd):&nbsp;</td><td class='base' width='25%'>
 	<select name='SYSLOGLEVEL'>
@@ -575,6 +578,17 @@ ieee80211n=1
 wmm_enabled=1
 ht_capab=$wlanapsettings{'HTCAPS'}
 END
+;
+
+ }elsif ( $wlanapsettings{'HW_MODE'} eq 'ac' ){
+	print CONFIGFILE <<END
+hw_mode=a
+ieee80211ac=1
+ieee80211n=1
+wmm_enabled=1
+ht_capab=$wlanapsettings{'HTCAPS'}
+vht_capab=$wlanapsettings{'VHTCAPS'}
+END
 ;
 
  }else{