diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 87dfadff0e..0c13314f26 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -422,14 +422,19 @@ function interfaces_wireless_configure($if, $wlcfg) {
                         break;
         }
 	
-	/*   if hostap is enabled and hidessid is enabled
-	 *   then hide the ssid from the general public.
+	/*   extra options during hostap mode
 	 */
 	if($wlcfg['mode'] == "hostap") {
-		if($wlcfg['hidessid'])
+		/* handle hide ssid option */
+		if(isset($wlcfg['hidessid']))
 			$ifcargs .= "hidessid ";
 		else
 			$ifcargs .= "-hidessid ";
+		/* handle pureg (802.11g) only option */
+		if(isset($wlcfg['pureg']))
+			$ifcargs .= "pureg ";
+		else
+			$ifcargs .= "-pureg ";
 	}
 
         $ifcargs .= "up";
diff --git a/usr/local/pkg/carp_settings.xml b/usr/local/pkg/carp_settings.xml
index e418d54363..05866daa72 100644
--- a/usr/local/pkg/carp_settings.xml
+++ b/usr/local/pkg/carp_settings.xml
@@ -105,6 +105,12 @@
 			<description>When this option is enabled, this system will automatically sync the ipsec rules over to the other carp host when changes are made.</description>
 			<type>checkbox</type>
 		</field>
+		<field>
+			<fielddescr>Synchronize SNMP</fielddescr>
+			<fieldname>synchronizesnmp</fieldname>
+			<description>When this option is enabled, this system will automatically sync the snmp settings over to the other carp host when changes are made.</description>
+			<type>checkbox</type>
+		</field>
 		<field>
 			<fielddescr>Synchronize traffic shaper</fielddescr>
 			<fieldname>synchronizetrafficshaper</fieldname>
diff --git a/usr/local/www/interfaces_wlan.inc b/usr/local/www/interfaces_wlan.inc
index 6f9a9706e2..259211d4bd 100755
--- a/usr/local/www/interfaces_wlan.inc
+++ b/usr/local/www/interfaces_wlan.inc
@@ -165,6 +165,20 @@ function wireless_config_print() {
                   </td>
                 </tr>
 
+                <tr> 
+                  <td valign="top" class="vncellreq">802.11g only</td>
+                  <td class="vtable">
+		  <?php
+			if(isset($pconfig['pureg']))
+				$CHECKED = " CHECKED";
+			else
+				$CHECKED = "";
+		  ?>
+		  <input name="pureg" type="checkbox" class="formfld" id="pureg"<?php echo $CHECKED; ?>><br>
+		  When operating as an access point in 802.11g mode allow only 11g-capable stations to associate (11b-only stations are not permitted to associate).
+                  </td>
+                </tr>
+
                 <tr> 
                   <td valign="top" class="vncellreq">Transmit power</td>
                   <td class="vtable">