--- 10-modem.fdi	2009-04-22 13:45:30.000000000 +0200
+++ 10-modem-mbm.fdi	2009-04-29 10:23:17.000000000 +0200
@@ -154,9 +154,40 @@
 
       <!-- Ericsson -->
       <match key="@info.parent:usb.vendor_id" int="0x0bdb">
-        <!-- Ericsson F3507g Mobile Broadband Minicard -->
+        <!-- Ericsson F3507g Mobile Broadband -->
         <match key="@info.parent:usb.product_id" int="0x1900">
-          <match key="@info.parent:usb.interface.number" int="4">
+          <match key="@info.parent:usb.interface.number" int="1">
+            <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+            <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+          </match>
+        </match>
+      </match>
+
+	  <match key="@info.parent:usb.vendor_id" int="0x0bdb">
+        <!-- Ericsson F3507g Mobile Broadband -->
+        <match key="@info.parent:usb.product_id" int="0x1902">
+          <match key="@info.parent:usb.interface.number" int="1">
+            <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+            <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+          </match>
+        </match>
+      </match>
+
+	  <match key="@info.parent:usb.vendor_id" int="0x0bdb">
+        <!-- Ericsson F3607gw Mobile Broadband -->
+        <match key="@info.parent:usb.product_id" int="0x1904">
+          <match key="@info.parent:usb.interface.number" int="1">
+            <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+            <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+          </match>
+        </match>
+      </match>
+
+      <!-- Toshiba -->
+      <match key="@info.parent:usb.vendor_id" int="0x0930">
+        <!-- Toshiba Mobile Broadband -->
+        <match key="@info.parent:usb.product_id" int="0x130b">
+          <match key="@info.parent:usb.interface.number" int="1">
             <append key="modem.command_sets" type="strlist">GSM-07.07</append>
             <append key="modem.command_sets" type="strlist">GSM-07.05</append>
           </match>
@@ -407,14 +438,20 @@
              5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G,
              HSDPA 5520,
              2x 5520 Voda I Mobile Broadband (3G HSDPA) Minicard,
-             5530 Mobile Broadband (3G HSPA) Mini-Card
         -->
-        <match key="@info.parent:usb.product_id" int_outof="0x8115;0x8116;0x8118;0x8136;0x8137;0x8138;0x8147">
+        <match key="@info.parent:usb.product_id" int_outof="0x8115;0x8116;0x8118;0x8136;0x8137;0x8138">
           <match key="@info.parent:usb.interface.number" int="0">
             <append key="modem.command_sets" type="strlist">GSM-07.07</append>
             <append key="modem.command_sets" type="strlist">GSM-07.05</append>
           </match>
         </match>
+		<!-- 5530 Mobile Broadband (3G HSPA) Mini-Card -->
+		<match key="@info.parent:usb.product_id" int_outof="0x8147">
+          <match key="@info.parent:usb.interface.number" int="1">
+            <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+            <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+          </match>
+        </match>
       </match>
 
       <!-- Quanta 3G modem -->
@@ -501,7 +538,18 @@
       <match key="modem.command_sets" exists="true">
         <addset key="info.capabilities" type="strlist">modem</addset>
       </match>
-
     </match>
+
+    <!-- Remove the net.80203 capability of mobile broadband devices -->
+	<match key="info.parent" contains_outof="413c_8147;bdb_1902;bdb_1900;930_130b">
+	  <match key="info.parent" suffix="_if7">
+		<remove key="info.capabilities" type="strlist">net.80203</remove>
+	  </match>
+	</match>
+	<match key="info.parent" contains_outof="bdb_1904">
+	  <match key="info.parent" suffix="_if6">
+		<remove key="info.capabilities" type="strlist">net.80203</remove>
+	  </match>
+	</match>
   </device>
 </deviceinfo>