diff --git a/daemon/core/emane/ieee80211abg.py b/daemon/core/emane/ieee80211abg.py
index 9115799a..65dce442 100644
--- a/daemon/core/emane/ieee80211abg.py
+++ b/daemon/core/emane/ieee80211abg.py
@@ -57,7 +57,11 @@ class EmaneIeee80211abgModel(EmaneModel):
         ("flowcontroltokens", coreapi.CONF_DATA_TYPE_UINT16, '10',
          '', 'number of flow control tokens'),
     ]
-    _confmatrix_mac_081 = [
+    # mac parameters introduced in EMANE 0.8.1 
+    # Note: The entry format for category queue parameters (queuesize, aifs, etc) were changed in
+    # EMANE 9.x, but are being preserved for the time being due to space constraints in the
+    # CORE GUI. A conversion function (get9xmacparamequivalent) has been defined to support this. 
+    _confmatrix_mac_extended = [
         ("wmmenable", coreapi.CONF_DATA_TYPE_BOOL, '0',
          'On,Off', 'WiFi Multimedia (WMM)'),
         ("queuesize", coreapi.CONF_DATA_TYPE_STRING, '0:255 1:255 2:255 3:255',
@@ -73,11 +77,8 @@ class EmaneIeee80211abgModel(EmaneModel):
         ("retrylimit", coreapi.CONF_DATA_TYPE_STRING, '0:3 1:3 2:3 3:3',
          '', 'retry limit (0-4:numretries)'),
     ]
-    _confmatrix_mac_091 = []
-    if 'EventService' in globals():
-        _confmatrix_mac = _confmatrix_mac_base + _confmatrix_mac_091
-    else:
-        _confmatrix_mac = _confmatrix_mac_base + _confmatrix_mac_081
+    _confmatrix_mac = _confmatrix_mac_base + _confmatrix_mac_extended
+
     # PHY parameters from Universal PHY
     _confmatrix_phy = EmaneUniversalModel._confmatrix
 
@@ -119,10 +120,44 @@ class EmaneIeee80211abgModel(EmaneModel):
         phynames = names[len(self._confmatrix_mac):]
 
         # append all MAC options to macdoc
-        map( lambda n: mac.appendChild(e.xmlparam(macdoc, n, \
+        if 'EventService' in globals():
+            for macname in macnames:
+                mac9xnvpairlist = self.get9xmacparamequivalent(macname, values)
+                for nvpair in mac9xnvpairlist:
+                    mac.appendChild(e.xmlparam(macdoc, nvpair[0], nvpair[1]))
+        else:
+            map( lambda n: mac.appendChild(e.xmlparam(macdoc, n, \
                                        self.valueof(n, values))), macnames)
+            
         e.xmlwrite(macdoc, self.macxmlname(ifc))
 
         phydoc = EmaneUniversalModel.getphydoc(e, self, values, phynames)
         e.xmlwrite(phydoc, self.phyxmlname(ifc))
 
+    #
+    # TEMP HACK: Account for parameter convention change in EMANE 9.x
+    # This allows CORE to preserve the entry layout for the mac 'category' parameters
+    # and work with EMANE 9.x onwards.
+    #
+    def  get9xmacparamequivalent(self, macname, values):
+        ''' Generate a list of 80211abg mac parameters in 0.9.x layout for a given mac parameter
+        in 8.x layout.For mac category parameters, the list returned will contain the four 
+        equivalent 9.x parameter and value pairs. Otherwise, the list returned will only
+        contain a single name and value pair.
+        '''
+        nvpairlist = []
+        macparmval = self.valueof(macname, values)
+        if macname in ["queuesize","aifs","cwmin","cwmax","txop","retrylimit"]:
+            for catval in macparmval.split():
+                idx_and_val = catval.split(":")
+                idx = int(idx_and_val[0])
+                val = idx_and_val[1]
+                # aifs and tx are in microseconds. Convert to seconds.
+                if macname in ["aifs","txop"]:
+                    val = "%f" % (float(val)*(1e-6))
+                name9x = "%s%d" % (macname, idx)
+                nvpairlist.append([name9x, val])
+        else:
+            nvpairlist.append([macname, macparmval])
+        return nvpairlist
+