--- a/package/gargoyle/files/www/js/basic.js
+++ b/package/gargoyle/files/www/js/basic.js
@@ -85,6 +85,11 @@
 			{
 				uci.set("wireless",  firstWirelessDevice, "htmode", getSelectedValue("wifi_channel_width"));
 			}
+
+			if(document.getElementById("wifi_hwmode_container").style.display == "block")
+                        {
+                                uci.set("wireless",  firstWirelessDevice, "hwmode", getSelectedValue("wifi_hwmode"));
+                        }

 			currentLanIp = document.getElementById("lan_ip").value;
 			if(getSelectedValue('wan_protocol') == 'none')
@@ -1381,7 +1386,17 @@
 	}


-
+	var hwmode = uciOriginal.get("wireless", firstWirelessDevice, "hwmode");
+	if(wirelessDriver == "mac80211" )
+	{
+		document.getElementById("wifi_hwmode_container").style.display="block";
+                setSelectedValue("wifi_hwmode", hwmode);
+	}
+	else
+	{
+                document.getElementById("wifi_hwmode").style.display="none";
+        }
+
 	wifiCfg2="";
 	wifiCfg3="";
 	if(allWirelessSections.length >= 2)
--- a/package/gargoyle/files/www/basic.sh
+++ b/package/gargoyle/files/www/basic.sh
@@ -465,6 +465,18 @@
 			</select>
 		</div>

+		<div id='wifi_hwmode_container'>
+                        <label class='leftcolumn' for='wifi_hwmode' id='wifi_hwmode_label'>Wireless Operation Mode:</label>
+                        <span class='rightcolumn'>
+                                <select id='wifi_hwmode'>
+					<option value='auto'>Auto</option>
+                                        <option value='11b'>Only B</option>
+					<option value='11g'>B+G</option>
+					<option value='11ng'>N+G</option>
+                                </select>
+                        </span>
+                </div>
+
 		<div id='wifi_txpower_container'>
 			<label class='leftcolumn' for='wifi_txpower_max' id='wifi_txpower_label'>Transmit Power:</label>
 			<span class='rightcolumn'>