diff -Nru mobile-broadband-provider-info-20100618/debian/changelog mobile-broadband-provider-info-20100930/debian/changelog
--- mobile-broadband-provider-info-20100618/debian/changelog	2010-06-18 17:23:27.000000000 +0000
+++ mobile-broadband-provider-info-20100930/debian/changelog	2010-09-30 04:51:01.000000000 +0000
@@ -1,95 +1,102 @@
-mobile-broadband-provider-info (20100618-0ubuntu1) maverick; urgency=low
+mobile-broadband-provider-info (20100930-0ubuntu1) maverick; urgency=low
 
-  * Merging upstream version 20100618 from git
+  * Merging upstream version 20100930 from git
+  * Summary of upstream changes:
+    - au: add crazy john support (LP: #599295)
+    - ca: add mobilicity/Dave support
+    - de: update 1und1 APN's
+    - il: pelephone: fix erroneous trailing space
+    - mx: remove incorrect Telcel DNS server (LP: #406696) 
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 30 Sep 2010 10:04:55 +0530
+
+mobile-broadband-provider-info (20100910-1) unstable; urgency=low
+
+  * Merging upstream version 20090910 from git
+  * Summary of upstream changes:
+    - ca: add Wind mobile broadband APN
+    - us: add Verizon SID
+    - af: add Afghan wireless (LP: #415203)
+    - ke: add Orange Kenya and fix Econet name (LP: #619233)
+    - de: add 1&1 support and fix plan names (Closes: #595198)
+    - it: add CoopVoce APN and update 3 italy plan names (LP: #632300)
+    - vn: add various networks like D-Com, Vinaphone, EVN-Telecom (UMTS)
+      and fix MobiFone APN (LP: #631376)
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 10 Sep 2010 16:45:05 +0530
+
+mobile-broadband-provider-info (20100824-1) unstable; urgency=low
+
+  * Merging upstream version 20100824 from git
+  * Summary of upstream changes:
+    - denmark: add CBB Mobil 
+    - germany: add Tchibo Mobil
+    - croatia: add CARNet
+    - croatia: correct vipnet 3G APN 
+    - australia: add Internode 
+    - nl: xs4all add a dummy username/password
+    - uae: add du (LP: #611658) 
+    - me: add new T-Mobile APNs (LP: #396722)
+    - pf: add Vini (LP: #344365)
+    - hr: fix T-Mobile APN (LP: #525251)
+    - hr: add Tele2
+    - pt: add username/password for TMN (LP: #372948)
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 26 Aug 2010 09:56:34 +0530
+
+mobile-broadband-provider-info (20100804-1) unstable; urgency=low
+
+  * Merging upstream version 20100804 from git
+  * Summary of upstream changes:
+    - build: fix .pc file CFLAGS
+    - Add balance check and voicemail attributes 
+    - api: fix DTD comment for 'network-id'
+    - dtd: add description of various items
+    - austria: fix name of Drei (3) hence hopefully fix a regression 
+      in ubuntu
+    - argentina: add old Claro APN to support N97 mini etc
+    - iran: add MCI and Irancell
+    - portugal: add Clix network support
+  * Bump up standards-version to 3.9.1 No other changes
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 04 Aug 2010 22:32:35 +0530
+
+mobile-broadband-provider-info (20100716-1) unstable; urgency=low
+
+  * Merging upstream version 20100716 from git
+  * Summary of upstream changes:
+    - us: support old Midwest Wireless SIDs
+    - us: support Mid-Rivers Cellular operator
+    - us: support MTPCS/CellularOne (former Chinook Wireless) operator
+    - us: support Alltel GSM roaming-only network
+    - rwanda/burundi: support various operators like africell and mtn
+    - hu: Pannon name changed to Telenor
+    - hu: support invitel operator
+    - de: fix Fonic operator APN   
 
- -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 18 Jun 2010 22:50:40 +0530
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 16 Jul 2010 18:57:56 +0530
 
-mobile-broadband-provider-info (20100617-0ubuntu1) maverick; urgency=low
+mobile-broadband-provider-info (20100702-1) unstable; urgency=low
 
-  * Merging upstream version 20100617 from git
+  * Merging upstream version 20100702 from git
   * Modifying long description in debian/control
   * Renaming upstream target in debian/rules to get-orig-source
+  * Bumping the Standards-Version to 3.9.0 No other changes
 
- -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 17 Jun 2010 22:02:44 +0530
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 02 Jul 2010 23:01:41 +0530
 
-mobile-broadband-provider-info (20100616-0ubuntu1) maverick; urgency=low
+mobile-broadband-provider-info (20100616-1) unstable; urgency=low
 
-  * Merging upstream version 20100616 from git
+  * Merging upstream version 20060616 from git
 
- -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 16 Jun 2010 20:29:54 +0530
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 16 Jun 2010 19:47:03 +0530
 
-mobile-broadband-provider-info (20100615-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100615 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 15 Jun 2010 21:46:58 +0530
-
-mobile-broadband-provider-info (20100614-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100614 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 14 Jun 2010 15:19:29 +0530
-
-mobile-broadband-provider-info (20100613-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100613 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Sun, 13 Jun 2010 23:19:34 +0530
-
-mobile-broadband-provider-info (20100611-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100611 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 11 Jun 2010 23:35:25 +0530
-
-mobile-broadband-provider-info (20100610-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100610 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 10 Jun 2010 18:01:20 +0530
-
-mobile-broadband-provider-info (20100608-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100608 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 08 Jun 2010 22:04:45 +0530
-
-mobile-broadband-provider-info (20100607-0ubuntu1) lucid; urgency=low
-
-  * Merging upstream version 20100607 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 07 Jun 2010 23:30:28 +0530
-
-mobile-broadband-provider-info (20100606-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100606 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Sun, 06 Jun 2010 19:57:28 +0530
-
-mobile-broadband-provider-info (20100605-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100605 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 05 Jun 2010 23:49:13 +0530
-
-mobile-broadband-provider-info (20100604-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100604 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 04 Jun 2010 19:03:51 +0530
-
-mobile-broadband-provider-info (20100603-0ubuntu1) maverick; urgency=low
-
-  * Merging upstream version 20100603 from git
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 03 Jun 2010 20:24:47 +0530
-
-mobile-broadband-provider-info (20100602-0ubuntu1) maverick; urgency=low
+mobile-broadband-provider-info (20100602-1) unstable; urgency=low
 
   * The "delay due to exams release"
   * Merging upstream version 20100602 from git
 
- -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 02 Jun 2010 20:18:19 +0530
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 02 Jun 2010 19:55:45 +0530
 
 mobile-broadband-provider-info (20100507-1) unstable; urgency=low
 
diff -Nru mobile-broadband-provider-info-20100618/debian/control mobile-broadband-provider-info-20100930/debian/control
--- mobile-broadband-provider-info-20100618/debian/control	2010-06-18 17:09:36.000000000 +0000
+++ mobile-broadband-provider-info-20100930/debian/control	2010-08-04 16:59:33.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Bhavani Shankar <bhavi@ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libxml2-utils
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders
 
 Package: mobile-broadband-provider-info
diff -Nru mobile-broadband-provider-info-20100618/mobile-broadband-provider-info.pc.in mobile-broadband-provider-info-20100930/mobile-broadband-provider-info.pc.in
--- mobile-broadband-provider-info-20100618/mobile-broadband-provider-info.pc.in	2010-06-18 16:47:47.000000000 +0000
+++ mobile-broadband-provider-info-20100930/mobile-broadband-provider-info.pc.in	2010-09-30 04:25:18.000000000 +0000
@@ -10,4 +10,4 @@
 Description: Mobile Broadband Service Provider Information Database
 Requires:
 Version: @VERSION@
-Cflags: -DMOBILE_BROADBAND_PROVIDER_INFO='\"${database}\"'
+Cflags: -DMOBILE_BROADBAND_PROVIDER_INFO='"${database}"'
diff -Nru mobile-broadband-provider-info-20100618/serviceproviders.2.dtd mobile-broadband-provider-info-20100930/serviceproviders.2.dtd
--- mobile-broadband-provider-info-20100618/serviceproviders.2.dtd	2010-06-18 16:47:47.000000000 +0000
+++ mobile-broadband-provider-info-20100930/serviceproviders.2.dtd	2010-09-30 04:25:18.000000000 +0000
@@ -6,7 +6,7 @@
 
 <!ELEMENT provider (name+, gsm?, cdma?)>
 
-<!ELEMENT gsm (network-id*, apn+)>
+<!ELEMENT gsm (network-id*, voicemail*, balance-check*, apn*)>
 <!ELEMENT apn (name*,
                gateway?,
                username?,
@@ -14,14 +14,63 @@
                dns*)>
 <!ATTLIST apn value CDATA #REQUIRED>
 
+<!ELEMENT voicemail (#PCDATA)>
+<!-- contains dial string used to access voicemail services for this provider -->
+<!-- for historical/legacy reasons network providers may support various alternative -->
+<!-- dial strings that can be used to access voicemail services -->
+
+<!ELEMENT balance-check (ussd*,
+                         dtmf*,
+                         sms*,
+                         ussd-response*)>
+<!-- for handset branding and historical/legacy reasons, network providers often -->
+<!-- support a number of alternative methods to check balance/allowance. -->
+<!-- the first element will typically be the default method -->
+
+<!ELEMENT ussd (#PCDATA)>
+<!-- contains * prefixed string which when sent to the network should result in a response text string from network -->
+
+<!ELEMENT dtmf (#PCDATA)>
+<!-- contains dial string used to access balance check service via voice call -->
+
+<!ELEMENT sms (#PCDATA)>
+<!ATTLIST sms text CDATA #REQUIRED>
+<!-- contains dial string and text string used to access balance check service via sms -->
+
+<!ELEMENT ussd-response (#PCDATA)>
+<!-- similar to standard ussd method but requires user to select options from initial network response -->
+<!-- typically, option 1 followed by option 3 will display remaining credit -->
+<!-- this method does not have widespread use -->
+
 <!ELEMENT network-id EMPTY>
 <!ATTLIST network-id mcc CDATA #REQUIRED>
 <!ATTLIST network-id mnc CDATA #REQUIRED>
+<!-- network-id should contain all the providers's known MCC/MNC codes.
+     The MCC should be a three-digit ITU E.212 Mobile Country Code (like
+     '310' or '409') and the MNC should be a two- or three-digit GSM
+     Mobile Network Code.  Even if the provider is an MVNO, it's upstream
+     network infrastructure provider's MCC/MNC codes should be included
+     so that the MCC+MNC from the IMSI of the MVNO's SIM can be roughly
+     matched to the provider.
+-->
+
+<!ELEMENT username (#PCDATA)>
+<!-- username required for authentication when starting a packet data session -->
 
-<!ELEMENT username (#PCDATA)> 
 <!ELEMENT password (#PCDATA)>
+<!-- password required for authentication when starting a packet data session -->
+
 <!ELEMENT dns (#PCDATA)>
+<!-- Any static IPv4 DNS servers required for the provider; usually these are
+     sent to the client automatically via PPP or PDP context negotiation and
+     this value is not used.
+-->
+
 <!ELEMENT gateway (#PCDATA)>
+<!-- Static IPv4 gateway to which IP traffic for the data session should be
+     directed to.  Usually the gateway is provided automatically via PPP or
+     PDP context negotiation and this value is not used.
+-->
 
 <!ELEMENT cdma (name*,
                 username?,
@@ -31,6 +80,7 @@
 
 <!ELEMENT sid EMPTY>
 <!ATTLIST sid value CDATA #REQUIRED>
+<!-- AMPS/CDMA System IDs known to be used by this provider -->
 
 <!ELEMENT name (#PCDATA)>
 <!ATTLIST name xml:lang CDATA #IMPLIED>
diff -Nru mobile-broadband-provider-info-20100618/serviceproviders.xml mobile-broadband-provider-info-20100930/serviceproviders.xml
--- mobile-broadband-provider-info-20100618/serviceproviders.xml	2010-06-18 16:47:47.000000000 +0000
+++ mobile-broadband-provider-info-20100930/serviceproviders.xml	2010-09-30 04:25:18.000000000 +0000
@@ -58,6 +58,27 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>du</name>
+		<gsm>
+			<network-id mcc="424" mnc="03"/>
+			<apn value="du"/>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Afghanistan -->
+<country code="af">
+	<provider>
+		<name>AWCC</name>
+		<gsm>
+			<network-id mcc="412" mnc="01"/>
+			<apn value="internet">
+				<username>awcc</username>
+				<password>1111</password>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Albania -->
@@ -148,11 +169,17 @@
 			<network-id mcc="722" mnc="320"/>
 			<network-id mcc="722" mnc="330"/>
 			<apn value="igprs.claro.com.ar">
+				<name>3G Internet</name>
 				<username>clarogprs</username>
 				<password>clarogprs999</password>
 				<dns>170.51.255.100</dns>
 				<dns>170.51.242.18</dns>
 			</apn>
+			<apn value="internet.ctimovil.com.ar">
+				<name>GPRS</name>
+				<username>clarogprs</username>
+				<password>clarogprs999</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -250,7 +277,7 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Three</name>
+		<name>Drei (3)</name>
 		<name xml:lang="de">Drei</name>
 		<gsm>
 			<network-id mcc="232" mnc="10"/>
@@ -274,6 +301,18 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>Internode</name>
+		<gsm>
+			<!-- http://www.internode.on.net/residential/broadband/3g_wireless/nodemobile_data/faq/#What_is_the_APN -->
+			<apn value="internode">
+				<name>NodeMobile Data</name>
+			</apn>
+			<apn value="splns333a1">
+				<name>Old NodeMobile Data (before 2009-08-26)</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Optus</name>
 		<gsm>
 			<network-id mcc="505" mnc="02"/>
@@ -298,6 +337,11 @@
 		<name>Telstra</name>
 		<gsm>
 			<network-id mcc="505" mnc="01"/>
+			<balance-check>
+				<dtmf>125111</dtmf>
+				<dtmf>1258888</dtmf>
+				<ussd-response>*100#</ussd-response>
+			</balance-check>
 			<apn value="telstra.wap">
 				<dns>139.130.4.4</dns>
 				<dns>203.50.2.71</dns>
@@ -369,6 +413,13 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Crazy John's</name>
+		<gsm>
+			<network-id mcc="505" mnc="38"/>
+			<apn value="purtona.net"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Azerbaijan -->
@@ -832,6 +883,24 @@
 	</provider>
 </country>
 
+<!-- Burundi -->
+<country code="bi">
+	<provider>
+		<name>Leo/UCom</name>
+		<gsm>
+			<network-id mcc="642" mnc="03"/>
+			<apn value="ucnet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tempo/Africell</name>
+		<gsm>
+			<network-id mcc="642" mnc="02"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Canada -->
 <country code="ca">
 	<provider>
@@ -954,7 +1023,24 @@
 		<name>WIND Mobile</name>
 		<gsm>
 			<network-id mcc="302" mnc="490"/>
-			<apn value="internet.windmobile.ca"/>
+			<apn value="internet.windmobile.ca">
+				<name>Mobile Internet</name>
+			</apn>
+			<apn value="broadband.windmobile.ca">
+				<name>Mobile Broadband</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Mobilicity</name>
+		<gsm>
+			<network-id mcc="302" mnc="320"/>
+			<apn value="wap.davewireless.com">
+				<name>Mobile Web</name>
+			</apn>
+			<apn value="internet.davewireless.com">
+				<name>Mobile Broadband</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -1388,6 +1474,17 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>Tchibo-Mobil</name>
+		<gsm>
+			<network-id mcc="262" mnc="07"/>
+			<network-id mcc="262" mnc="08"/>
+			<network-id mcc="262" mnc="11"/>
+			<apn value="webmobil1">
+				<name>Tagesflat / Monats-Flatrate L / Monats-Flatrate XL</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>T-mobile (D1)</name>
 		<gsm>
 			<network-id mcc="262" mnc="01"/>
@@ -1428,7 +1525,10 @@
 			<network-id mcc="262" mnc="07"/>
 			<network-id mcc="262" mnc="08"/>
 			<network-id mcc="262" mnc="11"/>
-			<apn value="pinternet.interkom.de"/>
+			<apn value="pinternet.interkomm.de">
+				<username>fonic</username>
+				<password>fonic</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1537,6 +1637,32 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Alice</name>
+		<gsm>
+			<network-id mcc="262" mnc="07"/>
+			<apn value="internet.partner1">
+				<name>Option Mobile</name>
+				<dns>193.189.244.225</dns>
+				<dns>193.189.244.206</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>1&amp;1</name>
+		<gsm>
+			<!-- Vodafone (D2) network -->
+			<network-id mcc="262" mnc="02"/>
+			<network-id mcc="262" mnc="04"/>
+			<network-id mcc="262" mnc="09"/>
+			<apn value="web.vodafone.de">
+				<name>Mobile Broadband</name>
+			</apn>
+			<apn value="mail.partner.de">
+				<name>Mobile Web</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Denmark -->
@@ -1546,13 +1672,16 @@
 		<gsm>
 			<network-id mcc="238" mnc="06"/>
 			<apn value="bredband.tre.dk">
-				<name>Bredbånd</name>
+				<name>Bredbånd (standard)</name>
  			</apn>
 			<apn value="net.tre.dk">
 				<name>Bredbånd Premium Kontant</name>
 			</apn>
 			<apn value="data.tre.dk">
-				<name>3 (Mobil Abonnement)</name>
+				<name>3 (standard for mobilkunder; spærret for indgående trafik)</name>
+			</apn>
+			<apn value="static.tre.dk">
+				<name>3 (statisk IP)</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -1584,6 +1713,16 @@
 			</apn>
 		</gsm>
 	</provider>
+
+	<!-- http://www.cbb.dk/mobil/hjaelp/manuel-opsaetning-af-mms-og-gprs/ -->
+	<provider>
+		<name>CBB Mobil</name>
+		<gsm>
+			<network-id mcc="238" mnc="02"/>
+			<network-id mcc="238" mnc="77"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
@@ -1627,6 +1766,18 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Unotel</name>
+		<gsm>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>happiimobil</name>
+		<gsm>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Dominican Republic -->
@@ -2077,7 +2228,11 @@
 			<network-id mcc="234" mnc="02"/>
 			<network-id mcc="234" mnc="10"/>
 			<network-id mcc="234" mnc="11"/>
-
+			<voicemail>901</voicemail>
+			<balance-check>
+				<ussd>*#10#</ussd>
+				<dtmf>4444</dtmf>
+			</balance-check>
 			<apn value="mobile.o2.co.uk">
 				<name>Contract</name>
 				<username>o2web</username>
@@ -2118,6 +2273,12 @@
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="234" mnc="30"/>
+			<voicemail>222</voicemail>
+			<balance-check>
+				<dtmf>150</dtmf>
+				<sms text="BA">150</sms>
+				<sms text="AL">150</sms>
+			</balance-check>
 			<apn value="general.t-mobile.uk">
 				<username>User</username>
 				<password>mms</password>
@@ -2141,6 +2302,11 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="234" mnc="15"/>
+			<voicemail>121</voicemail>
+			<balance-check>
+				<ussd>*#1345#</ussd>
+				<dtmf>2345</dtmf>
+			</balance-check>
 			<apn value="internet">
 				<name>Contract</name>
 				<username>web</username>
@@ -2177,7 +2343,10 @@
 		<gsm>
 			<network-id mcc="234" mnc="33"/>
 			<network-id mcc="234" mnc="34"/>
-
+			<voicemail>123</voicemail>
+			<balance-check>
+				<dtmf>453</dtmf>
+			</balance-check>
 			<apn value="orangeinternet">
 				<name>Contract</name>
 				<username>orange</username>
@@ -2428,7 +2597,7 @@
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="219" mnc="01"/>
-			<apn value="web.htgpr">
+			<apn value="web.htgprs">
 				<dns>10.12.0.1</dns>
 			</apn>
 		</gsm>
@@ -2449,7 +2618,7 @@
 				<password>38591</password>
 				<dns>195.29.159.15</dns>
 			</apn>
-			<apn value="3g.vipnet.hr">
+			<apn value="3g.vip.hr">
 				<name>3G</name>
 				<username>38591</username>
 				<password>38591</password>
@@ -2458,28 +2627,47 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>CARNet VIPNET</name>
+		<gsm>
+			<network-id mcc="219" mnc="10"/>
+			<apn value="carnet.vip.hr">
+				<username>AAIEDU</username>
+				<password></password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>CARNet Tele2</name>
+		<gsm>
+			<network-id mcc="219" mnc="02"/>
+			<apn value="carnet.tele2.hr">
+				<username>AAIEDU</username>
+				<password></password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tele2</name>
+		<gsm>
+			<network-id mcc="219" mnc="02"/>
+			<apn value="mobileinternet.tele2.hr">
+				<dns>212.247.156.66</dns>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Hungary -->
 <country code="hu">
 	<provider>
-		<name>Pannon</name>
+		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="216" mnc="01"/>
-			<apn value="netx">
-				<name>átalánydíjas</name>
-				<dns>193.225.155.254</dns>
-				<dns>194.149.0.157</dns>
-			</apn>
 			<apn value="net">
-				<name>Normál</name>
-				<dns>193.225.153.17</dns>
-				<dns>195.56.172.113</dns>
-			</apn>
-			<apn value="snet">
-				<name>Tömörített</name>
-				<dns>193.225.153.17</dns>
-				<dns>194.149.0.157</dns>
+				<name>mobilinternet</name>
+				<dns>217.79.128.40</dns>
+				<dns>217.79.128.45</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -2529,6 +2717,15 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Invitel</name>
+                <!-- MVNO operating on Telenor's network -->
+		<gsm>
+			<apn value="invitel.mobilnet">
+				<name>net.and.go</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Indonesia -->
@@ -2604,6 +2801,9 @@
 		<name>O2</name>
 		<gsm>
 			<network-id mcc="272" mnc="02"/>
+			<balance-check>
+				<ussd>*#100#</ussd>
+			</balance-check>
 			<apn value="open.internet">
 				<name>Contract</name>
 				<username>gprs</username>
@@ -2680,7 +2880,8 @@
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="425" mnc="01"/>
-			<apn value="orangeinternet">
+			<apn value="uinternet">
+				<name>3G Internet</name>
 				<dns>158.43.192.1</dns>
 				<dns>158.43.128.1</dns>
 			</apn>
@@ -2690,7 +2891,7 @@
 		<name>Pelephone</name>
 		<gsm>
 			<network-id mcc="425" mnc="03"/>
-			<apn value="internet.pelephone.net.il ">
+			<apn value="internet.pelephone.net.il">
 				<name>3G</name>
 				<username>pcl@3g</username>
 				<password>pcl</password>
@@ -3065,6 +3266,26 @@
 	</provider>
 </country>
 
+<!-- Iran -->
+<country code="ir">
+	<provider>
+		<name>همراه اول</name>
+		<gsm>
+			<network-id mcc="432" mnc="11"/>
+			<apn value="mcinet">
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>ایرانسل</name>
+		<gsm>
+			<network-id mcc="432" mnc="35"/>
+			<apn value="mtnirancell">
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Iceland -->
 <country code="is">
 	<provider>
@@ -3154,10 +3375,10 @@
 		<gsm>
 			<network-id mcc="222" mnc="99"/>
 			<apn value="tre.it">
-				<name>Standard</name>
+				<name>Ricaricabile</name>
 			</apn>
 			<apn value="datacard.tre.it">
-				<name>Tre.Dati</name>
+				<name>Abbonamento</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -3179,6 +3400,15 @@
 			<apn value="internet.postemobile.it"/>
 		</gsm>
 	</provider>
+	<provider>
+		<name>CoopVoce</name>
+		<gsm>
+			<network-id mcc="222" mnc="01"/>
+			<apn value="web.coopvoce.it">
+				<name>Internet Mobile</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Jersey -->
@@ -3363,11 +3593,22 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Econet</name>
+		<name>yu (Econet)</name>
 		<gsm>
+			<network-id mcc="639" mnc="05"/>
 			<apn value="internet.econet.co.ke"/>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Orange</name>
+		<gsm>
+			<network-id mcc="639" mnc="07"/>
+			<apn value="bew.orange.co.ke"/>
+		</gsm>
+		<cdma>
+			<name>Orange Fixed Plus</name>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Cambodia -->
@@ -3804,7 +4045,22 @@
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="297" mnc="02"/>
-			<apn value="internet-postpaid"/>
+			<apn value="tcmg-data">
+				<name>Mobile Broadband</name>
+				<username>38267</username>
+				<password>38267</password>
+			</apn>
+			<apn value="tcmg-nw">
+				<name>GPRS</name>
+				<username>38267</username>
+				<password>38267</password>
+			</apn>
+			<apn value="internet-postpaid">
+				<name>Postpaid (old)</name>
+			</apn>
+			<apn value="internet-prepaid">
+				<name>Prepaid (old)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3932,7 +4188,6 @@
 			<apn value="internet.itelcel.com">
 				<username>webgprs</username>
 				<password>webgprs2002</password>
-				<dns>148.233.151.245</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -4180,7 +4435,10 @@
 	<provider>
 		<name>XS4ALL Mobiel Internet</name>
 		<gsm>
-			<apn value="umts.xs4all.nl"/>
+			<apn value="umts.xs4all.nl">
+				<username>xs4all</username>
+				<password>xs4all</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4227,6 +4485,10 @@
 		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="242" mnc="01"/>
+			<balance-check>
+				<dtmf>220</dtmf>
+				<sms text="saldo">222</sms>
+			</balance-check>
 			<apn value="telenor">
 				<dns>212.17.131.3</dns>
 				<dns>148.122.161.2</dns>
@@ -4424,6 +4686,17 @@
 	</provider>
 </country>
 
+<!-- French Polynesia -->
+<country code="pf">
+	<provider>
+		<name>Vini</name>
+		<gsm>
+			<network-id mcc="547" mnc="20"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Philippines -->
 <country code="ph">
 	<provider>
@@ -4607,10 +4880,22 @@
 		</gsm>
 	</provider>
 	<provider>
+		<!-- Merged with Optimus in 2010 -->
+		<name>Clix</name>
+		<gsm>
+			<network-id mcc="286" mnc="03"/>
+			<apn value="clixinternetmovel"/>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Optimus</name>
 		<gsm>
 			<network-id mcc="286" mnc="03"/>
+			<apn value="umts">
+				<name>3G</name>
+			</apn>
 			<apn value="internet">
+				<name>GPRS</name>
 				<dns>194.79.69.129</dns>
 			</apn>
 		</gsm>
@@ -4620,6 +4905,8 @@
 		<gsm>
 			<network-id mcc="286" mnc="06"/>
 			<apn value="internet">
+				<username>tmn</username>
+				<password>tmn</password>
 				<dns>194.65.3.20</dns>
 				<dns>194.65.3.21</dns>
 			</apn>
@@ -4786,6 +5073,18 @@
 	</provider>
 </country>
 
+<!-- Rwanda -->
+<country code="rw">
+	<provider>
+		<name>MTN</name>
+		<gsm>
+			<network-id mcc="635" mnc="10"/>
+			<apn value="internet.mtn">
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Russia -->
 <country code="ru">
 	<provider>
@@ -5169,6 +5468,10 @@
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
 			<network-id mcc="240" mnc="05"/>
+			<balance-check>
+				<ussd>*111#</ussd>
+				<dtmf>211</dtmf>
+			</balance-check>
 			<!-- http://www.tele2.se/internet-via-gprs.html -->
 			<apn value="internet.tele2.se">
 				<name>Mobilt Internet</name>
@@ -5225,7 +5528,10 @@
 		<gsm>
 			<network-id mcc="240" mnc="01"/>
 			<network-id mcc="240" mnc="05"/>
-
+			<balance-check>
+				<ussd>*120#</ussd>
+				<ussd>*121#</ussd>
+			</balance-check>
 			<!-- http://www3.telia.se/foretag/mobilguiden/ -->
 			<apn value="online.telia.se"/>
 		</gsm>
@@ -5508,6 +5814,22 @@
 	</provider>
 </country>
 
+<!-- Tunisia -->
+<country code="tn">
+	<provider>
+		<name>Orange</name>
+		<gsm>
+			<network-id mcc="605" mnc="01"/>
+			<apn value="keygp">
+				<name>Internet Everywhere Prepaid</name>
+			</apn>
+			<apn value="keypro">
+				<name>Internet Everywhere Professional</name>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
 <!-- Turkey -->
 <country code="tr">
 	<provider>
@@ -6113,6 +6435,7 @@
 			<sid value="1224"/>
 			<sid value="1227"/>
 			<sid value="1230"/>
+			<sid value="1267"/>
 			<sid value="1285"/>
 			<sid value="1330"/>
 			<sid value="1358"/>
@@ -6269,6 +6592,10 @@
 	</provider>
 	<provider>
 		<name>Alltel</name>
+		<gsm>
+			<!-- Former Western Wireless (roaming only) -->
+			<network-id mcc="310" mnc="590"/>
+		</gsm>
 		<cdma>
 			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
 			<sid value="32"/>
@@ -6339,6 +6666,7 @@
 			<sid value="478"/>
 			<sid value="487"/>
 			<sid value="491"/>
+			<sid value="504"/>
 			<sid value="518"/>
 			<sid value="520"/>
 			<sid value="544"/>
@@ -6373,6 +6701,7 @@
 			<sid value="1148"/>
 			<sid value="1154"/>
 			<sid value="1156"/>
+			<sid value="1236"/>
 			<sid value="1244"/>
 			<sid value="1246"/>
 			<sid value="1248"/>
@@ -6401,6 +6730,8 @@
 			<sid value="1344"/>
 			<sid value="1346"/>
 			<sid value="1348"/>
+			<sid value="1370"/>
+			<sid value="1372"/>
 			<sid value="1375"/>
 			<sid value="1383"/>
 			<sid value="1385"/>
@@ -6473,6 +6804,7 @@
 			<sid value="3020"/>
 			<sid value="3226"/>
 			<sid value="3244"/>
+			<sid value="3292"/>
 			<sid value="30524"/>
 			<sid value="30635"/>
 		</cdma>
@@ -6539,6 +6871,19 @@
 			<apn value="ISP"/>
 		</gsm>
 	</provider>
+	<provider>
+		<name>MTPCS (Cellular One)</name>
+		<gsm>
+			<network-id mcc="310" mnc="570"/>
+			<apn value="wapgw.chinookwireless.net"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Mid-Rivers Cellular</name>
+		<cdma>
+			<sid value="3102"/>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Uruguay -->
@@ -6663,7 +7008,7 @@
 		<name>MobiFone</name>
 		<gsm>
 			<network-id mcc="452" mnc="01"/>
-			<apn value="v-wap">
+			<apn value="m-wap">
 				<username>mms</username>
 				<password>mms</password>
 			</apn>
@@ -6674,6 +7019,12 @@
 		<gsm>
 			<network-id mcc="452" mnc="02"/>
 			<apn value="m3-world">
+				<name>Mobile Internet</name>
+				<username>mms</username>
+				<password>mms</password>
+			</apn>
+			<apn value="m3-card">
+				<name>Mobile Broadband</name>
 				<username>mms</username>
 				<password>mms</password>
 			</apn>
@@ -6694,7 +7045,12 @@
 		<name>Viettel Mobile</name>
 		<gsm>
 			<network-id mcc="452" mnc="04"/>
-			<apn value="v-internet"/>
+			<apn value="v-internet">
+				<name>Mobile Internet</name>
+			</apn>
+			<apn value="e-connect">
+				<name>D-com 3G</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6705,7 +7061,13 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>E-Mobile</name>
+		<name>EVNTelecom/E-Mobile</name>
+		<gsm>
+			<network-id mcc="452" mnc="08"/>
+			<apn value="e-internet">
+				<name>EVNTelecomNet</name>
+			</apn>
+		</gsm>
 		<cdma>
 			<username>evntelecom</username>
 			<password>evntelecom</password>