diff -Nru mobile-broadband-provider-info-20221107/configure.ac mobile-broadband-provider-info-20230416/configure.ac
--- mobile-broadband-provider-info-20221107/configure.ac	2022-11-07 07:10:50.000000000 +0000
+++ mobile-broadband-provider-info-20230416/configure.ac	2023-04-16 19:23:13.000000000 +0000
@@ -1,7 +1,7 @@
 AC_PREREQ(2.52)
 
 AC_INIT(mobile-broadband-provider-info,
-	20221107,
+	20230416,
 	[https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/issues],
 	mobile-broadband-provider-info)
 AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-xz])
diff -Nru mobile-broadband-provider-info-20221107/debian/changelog mobile-broadband-provider-info-20230416/debian/changelog
--- mobile-broadband-provider-info-20221107/debian/changelog	2022-11-19 11:27:33.000000000 +0000
+++ mobile-broadband-provider-info-20230416/debian/changelog	2023-04-23 12:33:14.000000000 +0000
@@ -1,3 +1,11 @@
+mobile-broadband-provider-info (20230416-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update debian/copyright
+  * Bump Standards-Version to 4.6.2, no changes
+
+ -- Graham Inggs <ginggs@debian.org>  Sun, 23 Apr 2023 12:33:14 +0000
+
 mobile-broadband-provider-info (20221107-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru mobile-broadband-provider-info-20221107/debian/control mobile-broadband-provider-info-20230416/debian/control
--- mobile-broadband-provider-info-20221107/debian/control	2022-11-19 11:08:54.000000000 +0000
+++ mobile-broadband-provider-info-20230416/debian/control	2023-04-23 12:32:04.000000000 +0000
@@ -5,7 +5,7 @@
 Build-Depends: debhelper-compat (= 13),
                libxml2-utils,
                xsltproc
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders
 Vcs-Browser: https://salsa.debian.org/debian/mobile-broadband-provider-info
diff -Nru mobile-broadband-provider-info-20221107/debian/copyright mobile-broadband-provider-info-20230416/debian/copyright
--- mobile-broadband-provider-info-20221107/debian/copyright	2022-11-19 11:08:54.000000000 +0000
+++ mobile-broadband-provider-info-20230416/debian/copyright	2023-04-23 12:29:03.000000000 +0000
@@ -3,15 +3,18 @@
 Source: https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders
 
 Files: *
-Copyright: 2008-2022 Antti Kaijanmäki <antti@kaijanmaki.net>,
-           Dan Williams <dcbw@redhat.com>, Jiří Klimeš <jklimes@redhat.com>
+Copyright: 2008-2023 Antti Kaijanmäki <antti@kaijanmaki.net>,
+                     Dan Williams <dcbw@redhat.com>,
+                     Jiří Klimeš <jklimes@redhat.com>,
+                     Lubomir Rintel <lkundrak@v3.sk>,
+                     Guido Günther <agx@sigxcpu.org>
 License: public-domain
 
 Files: debian/*
 Copyright: 2009 Daniel Baumann <daniel@debian.org>
            2009-2017 Bhavani Shankar <bhavi@ubuntu.com>
            2016 W. Martin Borgert <debacle@debian.org>
-           2019-2022 Graham Inggs <ginggs@debian.org>
+           2019-2023 Graham Inggs <ginggs@debian.org>
 License: public-domain
 
 License: public-domain
diff -Nru mobile-broadband-provider-info-20221107/MAINTAINERS mobile-broadband-provider-info-20230416/MAINTAINERS
--- mobile-broadband-provider-info-20221107/MAINTAINERS	2022-11-07 07:10:50.000000000 +0000
+++ mobile-broadband-provider-info-20230416/MAINTAINERS	2023-04-16 19:23:13.000000000 +0000
@@ -1,11 +1,15 @@
 Antti Kaijanmäki
-E-mail: antti kaijanmaki net
+E-mail: antti.kaijanmaki.net
 Userid: kaijanma
 
 Dan Williams
-E-mail: dcbw redhat com
+E-mail: dcbw@redhat.com
 Userid: dcbw
 
-Jiří Klimeš
-E-mail: jklimes redhat com
-Userid: jklimes
+Lubomir Rintel
+E-mail: lkundrak@v3.sk
+Userid: lkundrak
+
+Guido Günther
+E-mail: agx@sigxcpu.org
+Userid: guidog
diff -Nru mobile-broadband-provider-info-20221107/mobile-broadband-provider-info.doap mobile-broadband-provider-info-20230416/mobile-broadband-provider-info.doap
--- mobile-broadband-provider-info-20221107/mobile-broadband-provider-info.doap	2022-11-07 07:10:50.000000000 +0000
+++ mobile-broadband-provider-info-20230416/mobile-broadband-provider-info.doap	2023-04-16 19:23:13.000000000 +0000
@@ -33,5 +33,12 @@
       <gnome:userid>lkundrak</gnome:userid>
     </foaf:Person>
   </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Guido Günther</foaf:name>
+      <foaf:mbox rdf:resource="mailto:agx@sigxcpu.org" />
+      <gnome:userid>guidog</gnome:userid>
+    </foaf:Person>
+  </maintainer>
 
 </Project>
diff -Nru mobile-broadband-provider-info-20221107/serviceproviders.2.dtd mobile-broadband-provider-info-20230416/serviceproviders.2.dtd
--- mobile-broadband-provider-info-20221107/serviceproviders.2.dtd	2022-11-07 07:10:50.000000000 +0000
+++ mobile-broadband-provider-info-20230416/serviceproviders.2.dtd	2023-04-16 19:23:13.000000000 +0000
@@ -1,7 +1,7 @@
 <!ELEMENT serviceproviders (country*)>
 <!ATTLIST serviceproviders format CDATA #REQUIRED>
 
-<!ELEMENT country (provider*)>
+<!ELEMENT country (name+, provider*)>
 <!ATTLIST country code CDATA #REQUIRED>
 
 <!ELEMENT provider (name+, gsm?, cdma?)>
diff -Nru mobile-broadband-provider-info-20221107/serviceproviders.xml mobile-broadband-provider-info-20230416/serviceproviders.xml
--- mobile-broadband-provider-info-20221107/serviceproviders.xml	2022-11-07 07:10:50.000000000 +0000
+++ mobile-broadband-provider-info-20230416/serviceproviders.xml	2023-04-16 19:23:13.000000000 +0000
@@ -39,8 +39,8 @@
 
 <serviceproviders format="2.0">
 
-<!-- Andorra -->
 <country code="ad">
+	<name>Andorra</name>
 	<provider>
 		<name>Andorra Telecom (Mobiland)</name>
 		<gsm>
@@ -66,8 +66,8 @@
 	</provider>
 </country>
 
-<!-- United Arab Emirates -->
 <country code="ae">
+	<name>United Arab Emirates</name>
 	<provider>
 		<name>Etisalat</name>
 		<gsm>
@@ -123,8 +123,8 @@
 	</provider>
 </country>
 
-<!-- Afghanistan -->
 <country code="af">
+	<name>Afghanistan</name>
 	<provider>
 		<name>AWCC</name>
 		<gsm>
@@ -146,8 +146,8 @@
 	</provider>
 </country>
 
-<!-- Albania -->
 <country code="al">
+	<name>Albania</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -192,8 +192,8 @@
 	</provider>
 </country>
 
-<!-- Armenia -->
 <country code="am">
+	<name>Armenia</name>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
@@ -332,8 +332,8 @@
 </country>
 
 
-<!-- Angola -->
 <country code="ao">
+	<name>Angola</name>
 	<provider>
 		<name>Movinet</name>
 		<cdma>
@@ -357,8 +357,8 @@
 	</provider>
 </country>
 
-<!-- Argentina -->
 <country code="ar">
+	<name>Argentina</name>
 	<provider>
 		<name>Personal</name>
 		<gsm>
@@ -463,8 +463,8 @@
 	</provider>
 </country>
 
-<!-- Austria -->
 <country code="at">
+	<name>Austria</name>
 	<provider>
 		<name>A1/Telekom Austria</name>
 		<gsm>
@@ -747,10 +747,10 @@
 	</provider>
 </country>
 
-<!-- Australia -->
 <!-- http://whirlpool.net.au/wiki/mobiles_apn
      http://ausdroid.net/apns/ -->
 <country code="au">
+	<name>Australia</name>
 	<provider>
 		<name>Aldi Mobile AU</name>
 		<!-- https://www.aldimobile.com.au/blogs/using-and-managing-your-service/what-are-the-data-internet-settings-for-my-aldimobile-service -->
@@ -1185,8 +1185,8 @@
 	</provider>
 </country>
 
-<!-- Azerbaijan -->
 <country code="az">
+	<name>Azerbaijan</name>
 	<provider>
 		<name>Azercell</name>
 		<gsm>
@@ -1228,8 +1228,8 @@
 	</provider>
 </country>
 
-<!-- Bosnia & Herzegovina -->
 <country code="ba">
+	<name>Bosnia and Herzegovina</name>
 	<provider>
 		<name>BH GSM</name>
 		<gsm>
@@ -1317,8 +1317,8 @@
 	</provider>
 </country>
 
-<!-- Barbados -->
 <country code="bb">
+	<name>Barbados</name>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
@@ -1331,8 +1331,8 @@
 	</provider>
 </country>
 
-<!-- Bangladesh -->
 <country code="bd">
+	<name>Bangladesh</name>
 	<provider>
 		<name>Robi (AKTel)</name>
 		<gsm>
@@ -1496,8 +1496,8 @@
 	</provider>
 </country>
 
-<!-- Belgium -->
 <country code="be">
+	<name>Belgium</name>
 	<provider>
 		<name>Lycamobile</name>
 		<gsm>
@@ -1667,8 +1667,8 @@
 	</provider>
 </country>
 
-<!-- Burkina Faso -->
 <country code="bf">
+	<name>Burkina Faso</name>
 	<provider>
 		<name>Airtel 3G</name>
 		<gsm>
@@ -1681,8 +1681,8 @@
 	</provider>
 </country>
 
-<!-- Bulgaria -->
 <country code="bg">
+	<name>Bulgaria</name>
 	<provider>
 		<name>GloBul</name>
 		<gsm>
@@ -1767,8 +1767,8 @@
 	</provider>
 </country>
 
-<!-- Bahrain -->
 <country code="bh">
+	<name>Bahrain</name>
 	<provider>
 		<name>Batelco</name>
 		<gsm>
@@ -1831,8 +1831,8 @@
 	</provider>
 </country>
 
-<!-- Brazil -->
 <country code="br">
+	<name>Brazil</name>
 	<provider>
 		<!-- Brasil Telecom was bought by Oi on 2009-01-09 and will be phased
 		     out and transitioned to Oi.
@@ -2018,8 +2018,8 @@
 	</provider>
 </country>
 
-<!-- Bahamas -->
 <country code="bs">
+	<name>Bahamas</name>
 	<provider>
 		<name>Aliv</name>
 		<gsm>
@@ -2041,8 +2041,8 @@
 	</provider>
 </country>
 
-<!-- Bermuda -->
 <country code="bm">
+	<name>Bermuda</name>
 	<provider>
 		<name>CellOne</name>
 		<gsm>
@@ -2054,8 +2054,8 @@
 	</provider>
 </country>
 
-<!-- Brunei -->
 <country code="bn">
+	<name>Brunei</name>
 	<provider>
 		<name>B-Mobile</name>
 		<gsm>
@@ -2094,8 +2094,8 @@
 	</provider>
 </country>
 
-<!-- Belarus -->
 <country code="by">
+	<name>Belarus</name>
 	<provider>
 		<!-- http://www.velcom.by/ru/services/gprs/settings/ -->
 		<name>velcom</name>
@@ -2225,8 +2225,8 @@
 	</provider>
 </country>
 
-<!-- Botswana -->
 <country code="bw">
+	<name>Botswana</name>
 	<provider>
 		<name>Mascom Wireless</name>
 		<gsm>
@@ -2255,8 +2255,8 @@
 	</provider>
 </country>
 
-<!-- Burundi -->
 <country code="bi">
+	<name>Burundi</name>
 	<provider>
 		<name>Leo/UCom</name>
 		<gsm>
@@ -2285,8 +2285,8 @@
 	</provider>
 </country>
 
-<!-- Canada -->
 <country code="ca">
+	<name>Canada</name>
 	<provider>
 		<name>Fido</name>
 		<gsm>
@@ -2319,6 +2319,16 @@
 				<dns>207.181.101.4</dns>
 				<dns>207.181.101.5</dns>
 			</apn>
+			<apn value="ltemobile.apn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Rogers Internet</name>
+			</apn>
+			<apn value="ltedata.apn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Rogers Tethering</name>
+			</apn>
 			<apn value="media.com">
 				<usage type="mms"/>
 				<name>Rogers Media</name>
@@ -2532,8 +2542,8 @@
 	</provider>
 </country>
 
-<!-- Congo (Dem. Rep.) -->
 <country code="cd">
+	<name>Congo (Dem. Rep.)</name>
 	<provider>
 		<name>Vodacom</name>
 		<gsm>
@@ -2554,12 +2564,12 @@
 	</provider>
 </country>
 
-<!-- Congo (Rep.) -->
 <country code="cg">
+	<name>Congo (Rep.)</name>
 </country>
 
-<!-- Switzerland -->
 <country code="ch">
+	<name>Switzerland</name>
 	<provider>
 		<name>Lycamobile</name>
 		<gsm>
@@ -2691,8 +2701,8 @@
 	</provider>
 </country>
 
-<!-- Cote d'Ivoire -->
 <country code="ci">
+	<name>Cote d'Ivoire</name>
 	<provider>
 		<name>MTN</name>
 		<gsm>
@@ -2721,8 +2731,8 @@
 	</provider>
 </country>
 
-<!-- Chile -->
 <country code="cl">
+	<name>Chile</name>
 	<provider>
 		<name>Claro Chile</name>
 		<gsm>
@@ -2833,8 +2843,8 @@
 	</provider>
 </country>
 
-<!-- Cameroon -->
 <country code="cm">
+	<name>Cameroon</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -2861,8 +2871,8 @@
 	</provider>
 </country>
 
-<!-- China -->
 <country code="cn">
+	<name>China</name>
 	<provider>
 		<name>China Mobile</name>
 		<gsm>
@@ -2944,8 +2954,8 @@
 	</provider>
 </country>
 
-<!-- Costa Rica -->
 <country code="cr">
+	<name>Costa Rica</name>
 	<provider>
 		<name>IceCelular</name>
 		<gsm>
@@ -2983,8 +2993,8 @@
 	</provider>
 </country>
 
-<!-- Colombia -->
 <country code="co">
+	<name>Colombia</name>
 	<provider>
 		<name>Claro</name>
 		<gsm>
@@ -3097,8 +3107,8 @@
 	</provider>
 </country>
 
-<!-- Cyprus -->
 <country code="cy">
+	<name>Cyprus</name>
 	<provider>
 		<name>Cytamobile-Vodafone</name>
 		<gsm>
@@ -3138,8 +3148,8 @@
 	</provider>
 </country>
 
-<!-- Czech Republic -->
 <country code="cz">
+	<name>Czech Republic</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -3232,8 +3242,8 @@
 	</provider>
 </country>
 
-<!-- Germany -->
 <country code="de">
+	<name>Germany</name>
 	<provider>
 		<name>AldiTalk/MedionMobile</name>
 		<gsm>
@@ -3656,8 +3666,8 @@
 	</provider>
 </country>
 
-<!-- Denmark -->
 <country code="dk">
+	<name>Denmark</name>
 	<provider primary="true">
 		<name>3</name>
 		<gsm>
@@ -3749,8 +3759,8 @@
 			<apn value="internet">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
-				<dns>212.88.64.199</dns>
-				<dns>212.88.64.14</dns>
+				<dns>212.242.40.3</dns>
+				<dns>212.242.40.51</dns>
 			</apn>
 			<apn value="telenor">
 				<usage type="mms"/>
@@ -3904,8 +3914,8 @@
 	</provider>
 </country>
 
-<!-- Dominican Republic -->
 <country code="do">
+	<name>Dominican Republic</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -3955,8 +3965,8 @@
 	</provider>
 </country>
 
-<!-- Algeria -->
 <country code="dz">
+	<name>Algeria</name>
 	<provider>
 		<name>Djezzy</name>
 		<gsm>
@@ -4017,8 +4027,8 @@
 	</provider>
 </country>
 
-<!-- Ecuador -->
 <country code="ec">
+	<name>Ecuador</name>
 	<provider>
 		<name>Movistar UMTS</name>
 		<gsm>
@@ -4059,8 +4069,8 @@
 	</provider>
 </country>
 
-<!-- Estonia -->
 <country code="ee">
+	<name>Estonia</name>
 	<provider>
 		<name>EMT</name>
 		<gsm>
@@ -4134,8 +4144,8 @@
 	</provider>
 </country>
 
-<!-- Egypt -->
 <country code="eg">
+	<name>Egypt</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -4198,8 +4208,8 @@
 	</provider>
 </country>
 
-<!-- Spain -->
 <country code="es">
+	<name>Spain</name>
 	<provider>
 		<name>Euskaltel</name>
 		<gsm>
@@ -4540,8 +4550,8 @@
 	</provider>
 </country>
 
-<!-- Ethiopia -->
 <country code="et">
+	<name>Ethiopia</name>
 	<provider>
 		<name>Ethio Telecom</name>
 		<gsm>
@@ -4564,8 +4574,8 @@
 	</provider>
 </country>
 
-<!-- Faroe Islands -->
 <country code="fo">
+	<name>Faroe Islands</name>
 	<provider>
 		<name>Vodafone FO</name>
 		<gsm>
@@ -4581,8 +4591,8 @@
 	</provider>
 </country>
 
-<!-- Finland -->
 <country code="fi">
+	<name>Finland</name>
 	<provider>
 		<name>Kuiri</name>
 		<gsm>
@@ -4745,8 +4755,8 @@
 	</provider>
 </country>
 
-<!-- Fiji -->
 <country code="fj">
+	<name>Fiji</name>
 	<provider>
 		<name>Vodafone / Kidanet</name>
 		<gsm>
@@ -4771,8 +4781,8 @@
 	</provider>
 </country>
 
-<!-- France -->
 <country code="fr">
+	<name>France</name>
 	<provider>
 		<name>A Mobile (Auchan Telecom)</name>
 		<gsm>
@@ -5134,8 +5144,8 @@
 	</provider>
 </country>
 
-<!-- Britain -->
 <country code="gb">
+	<name>Britain</name>
 	<provider>
 		<name>BT Mobile</name>
 		<gsm>
@@ -5262,6 +5272,21 @@
 		</gsm>
 	</provider>
 	<provider>
+		<!-- https://help.superdrugmobile.com/en/articles/3395643-android-set-your-phone-to-work-abroad -->
+		<name>Superdrug</name>
+		<gsm>
+			<network-id mcc="234" mnc="20"/>
+			<apn value="superdrug.net">
+				<usage type="internet"/>
+			</apn>
+			<apn value="superdrug.net">
+				<usage type="mms"/>
+				<mmsc>http://mms.um.three.co.uk:10021/mmsc</mmsc>
+				<mmsproxy>217.171.129.2:8799</mmsproxy>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>giffgaff</name>
 		<gsm>
 			<network-id mcc="234" mnc="02"/>
@@ -5432,8 +5457,8 @@
 	</provider>
 </country>
 
-<!-- Georgia -->
 <country code="ge">
+	<name>Georgia</name>
 	<provider>
 		<name>Geocell</name>
 		<gsm>
@@ -5454,8 +5479,8 @@
 	</provider>
 </country>
 
-<!-- Guernsey -->
 <country code="gg">
+	<name>Guernsey</name>
 	<provider>
 		<name>Airtel-Vodaphone</name>
 		<gsm>
@@ -5509,8 +5534,8 @@
 	</provider>
 </country>
 
-<!-- Ghana -->
 <country code="gh">
+	<name>Ghana</name>
 	<provider>
 		<name>MTN</name>
 		<gsm>
@@ -5610,8 +5635,8 @@
 	</provider>
 </country>
 
-<!-- Greenland -->
 <country code="gl">
+	<name>Greenland</name>
 	<!-- http://www.tele.gl/da-DK/Privat/Info/Selvbetjening/Mobilopsaetning/Sider/ManuelOpsaetning.aspx -->
 	<provider>
 		<name>Tele Greenland A/S</name>
@@ -5623,8 +5648,8 @@
 	</provider>
 </country>
 
-<!-- Greece -->
 <country code="gr">
+	<name>Greece</name>
 	<provider>
 		<name>Cosmote</name>
 		<gsm>
@@ -5697,8 +5722,8 @@
 	</provider>
 </country>
 
-<!-- Guatemala -->
 <country code="gt">
+	<name>Guatemala</name>
 	<provider>
 		<name>Claro</name>
 		<gsm>
@@ -5741,8 +5766,8 @@
 	</provider>
 </country>
 
-<!-- Guinea -->
 <country code="gn">
+	<name>Guinea</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -5767,8 +5792,8 @@
 	</provider>
 </country>
 
-<!-- Guyana -->
 <country code="gy">
+	<name>Guyana</name>
 	<provider>
 		<name>GT&amp;T Cellink Plus</name>
 		<gsm>
@@ -5803,8 +5828,8 @@
 	</provider>
 </country>
 
-<!-- Hong Kong -->
 <country code="hk">
+	<name>Hong Kong</name>
 	<provider>
 		<name>CSL</name>
 		<gsm>
@@ -5957,8 +5982,8 @@
 	</provider>
 </country>
 
-<!-- Honduras -->
 <country code="hn">
+	<name>Honduras</name>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
@@ -5971,8 +5996,8 @@
 	</provider>
 </country>
 
-<!-- Croatia -->
 <country code="hr">
+	<name>Croatia</name>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
@@ -6069,8 +6094,8 @@
 	</provider>
 </country>
 
-<!-- Hungary -->
 <country code="hu">
+	<name>Hungary</name>
 	<provider>
 		<name>Telenor</name>
 		<gsm>
@@ -6172,8 +6197,8 @@
 	</provider>
 </country>
 
-<!-- Indonesia -->
 <country code="id">
+	<name>Indonesia</name>
 	<provider>
 		<name>3</name>
 		<gsm>
@@ -6366,8 +6391,8 @@
 	</provider>
 </country>
 
-<!-- Ireland -->
 <country code="ie">
+	<name>Ireland</name>
 	<provider>
 		<name>Lycamobile</name>
 		<gsm>
@@ -6525,8 +6550,8 @@
 	</provider>
 </country>
 
-<!-- Israel -->
 <country code="il">
+	<name>Israel</name>
 	<provider>
 		<name>CellCom</name>
 		<gsm>
@@ -6677,8 +6702,8 @@
 	</provider>
 </country>
 
-<!-- Isle of Man -->
 <country code="im">
+	<name>Isle of Man</name>
 	<provider>
 		<name>Manx Telecom</name>
 		<gsm>
@@ -6716,8 +6741,8 @@
 	</provider>
 </country>
 
-<!-- India -->
 <country code="in">
+	<name>India</name>
 	<provider>
 		<name>AIRCEL</name>
 		<gsm>
@@ -7177,8 +7202,8 @@
 	</provider>
 </country>
 
-<!-- Iraq -->
 <country code="iq">
+	<name>Iraq</name>
 	<provider>
 		<name>Itisaluna</name>
 		<cdma>
@@ -7230,8 +7255,8 @@
 	</provider>
 </country>
 
-<!-- Iran -->
 <country code="ir">
+	<name>Iran</name>
 	<provider>
 		<name>همراه اول</name>
 		<gsm>
@@ -7254,8 +7279,8 @@
 	</provider>
 </country>
 
-<!-- Iceland -->
 <country code="is">
+	<name>Iceland</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -7307,8 +7332,8 @@
 	</provider>
 </country>
 
-<!-- Italy -->
 <country code="it">
+	<name>Italy</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -7548,8 +7573,8 @@
 	</provider>
 </country>
 
-<!-- Jersey -->
 <country code="je">
+	<name>Jersey</name>
 	<provider>
 		<name>Airtel-Vodaphone</name>
 		<gsm>
@@ -7592,8 +7617,8 @@
 	</provider>
 </country>
 
-<!-- Jamaica -->
 <country code="jm">
+	<name>Jamaica</name>
 	<provider>
 		<name>Cable &amp; Wireless</name>
 		<gsm>
@@ -7620,8 +7645,8 @@
 	</provider>
 </country>
 
-<!-- Hashemite Kingdom of Jordan -->
 <country code="jo">
+	<name>Hashemite Kingdom of Jordan</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -7656,8 +7681,8 @@
 	</provider>
 </country>
 
-<!-- Japan -->
 <country code="jp">
+	<name>Japan</name>
 	<provider>
 		<name>Softbank Mobile</name>
 		<gsm>
@@ -7895,8 +7920,8 @@
 	</provider>
 </country>
 
-<!-- Kenya -->
 <country code="ke">
+	<name>Kenya</name>
 	<provider>
 		<name>Airtel</name>
 		<gsm>
@@ -7971,8 +7996,8 @@
 	</provider>
 </country>
 
-<!-- Kyrgyzstan -->
 <country code="kg">
+	<name>Kyrgyzstan</name>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
@@ -8014,8 +8039,8 @@
 	</provider>
 </country>
 
-<!-- Cambodia -->
 <country code="kh">
+	<name>Cambodia</name>
 	<provider>
 		<name>Cellcard</name>
 		<gsm>
@@ -8153,8 +8178,8 @@
 	</provider>
 </country>
 
-<!-- Korea, Republic of -->
 <country code="kr">
+	<name>Korea, Republic of</name>
 	<provider>
 		<name>KT</name>
 		<gsm>
@@ -8223,8 +8248,8 @@
 	</provider>
 </country>
 
-<!-- Kuwait -->
 <country code="kw">
+	<name>Kuwait</name>
 	<provider>
 		<name>Zain</name>
 		<gsm>
@@ -8277,8 +8302,8 @@
 	</provider>
 </country>
 
-<!-- Kazakhstan -->
 <country code="kz">
+	<name>Kazakhstan</name>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
@@ -8341,8 +8366,8 @@
 	</provider>
 </country>
 
-<!-- Laos -->
 <country code="la">
+	<name>Laos</name>
 	<provider>
 		<name>ETL</name>
 		<gsm>
@@ -8395,8 +8420,8 @@
 	</provider>
 </country>
 
-<!-- Lebanon -->
 <country code="lb">
+	<name>Lebanon</name>
 	<provider>
 		<name>MTC Touch</name>
 		<gsm>
@@ -8416,8 +8441,8 @@
 	</provider>
 </country>
 
-<!-- Liechtenstein -->
 <country code="li">
+	<name>Liechtenstein</name>
 	<provider>
 		<name>Datamobile</name>
 		<gsm>
@@ -8430,8 +8455,8 @@
 	</provider>
 </country>
 
-<!-- St Lucia -->
 <country code="lc">
+	<name>St Lucia</name>
 	<provider>
 		<name>Cable &amp; Wireless</name>
 		<gsm>
@@ -8450,8 +8475,8 @@
 	</provider>
 </country>
 
-<!-- Sri Lanka -->
 <country code="lk">
+	<name>Sri Lanka</name>
 	<provider>
 		<name>Airtel</name>
 		<gsm>
@@ -8532,8 +8557,8 @@
 	</provider>
 </country>
 
-<!-- Lesotho -->
 <country code="ls">
+	<name>Lesotho</name>
 	<provider>
 		<name>Vodacom Lesotho</name>
 		<gsm>
@@ -8546,8 +8571,8 @@
 	</provider>
 </country>
 
-<!-- Lithuania -->
 <country code="lt">
+	<name>Lithuania</name>
 	<provider>
 		<name>Bite</name>
 		<gsm>
@@ -8626,8 +8651,8 @@
 	</provider>
 </country>
 
-<!-- Luxembourg -->
 <country code="lu">
+	<name>Luxembourg</name>
 	<provider>
 		<name>LUXGSM</name>
 		<gsm>
@@ -8714,8 +8739,8 @@
 	</provider>
 </country>
 
-<!-- Latvia -->
 <country code="lv">
+	<name>Latvia</name>
 	<provider>
 		<name>LMT</name>
 		<gsm>
@@ -8790,8 +8815,8 @@
 	</provider>
 </country>
 
-<!-- Morocco -->
 <country code="ma">
+	<name>Morocco</name>
 	<provider>
 		<name>Ittissalat Al Maghrib (IAM)</name>
 		<gsm>
@@ -8861,8 +8886,8 @@
 	</provider>
 </country>
 
-<!-- Moldova -->
 <country code="md">
+	<name>Moldova</name>
 	<provider>
 		<name>Moldcell</name>
 		<gsm>
@@ -8917,8 +8942,8 @@
 	</provider>
 </country>
 
-<!-- Montenegro -->
 <country code="me">
+	<name>Montenegro</name>
 	<provider>
 		<name>ProMonte GSM</name>
 		<gsm>
@@ -8987,8 +9012,8 @@
 	</provider>
 </country>
 
-<!-- Madagascar -->
 <country code="mg">
+	<name>Madagascar</name>
 	<provider>
 		<name>Airtel</name>
 		<gsm>
@@ -9023,8 +9048,8 @@
 	</provider>
 </country>
 
-<!-- Mali -->
 <country code="ml">
+	<name>Mali</name>
 	<provider>
 		<name>Malitel</name>
 		<gsm>
@@ -9065,8 +9090,8 @@
 	</provider>
 </country>
 
-<!-- Myanmar -->
 <country code="mm">
+	<name>Myanmar</name>
 	<provider>
 		<name>MPT</name>
 		<gsm>
@@ -9108,8 +9133,8 @@
 	</provider>
 </country>
 
-<!-- Mongolia -->
 <country code="mn">
+	<name>Mongolia</name>
 	<provider>
 		<name>MobiCom</name>
 		<gsm>
@@ -9128,8 +9153,8 @@
 	</provider>
 </country>
 
-<!-- Macau -->
 <country code="mo">
+	<name>Macau</name>
 	<provider>
 		<name>3 / Hutchison</name>
 		<gsm>
@@ -9174,8 +9199,8 @@
 	</provider>
 </country>
 
-<!-- Macedonia -->
 <country code="mk">
+	<name>Macedonia</name>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
@@ -9237,8 +9262,8 @@
 	</provider>
 </country>
 
-<!-- Malta -->
 <country code="mt">
+	<name>Malta</name>
 	<provider>
 		<name>GO Mobile</name>
 		<gsm>
@@ -9291,8 +9316,8 @@
 	</provider>
 </country>
 
-<!-- Mauritius -->
 <country code="mu">
+	<name>Mauritius</name>
 	<provider>
 		<name>Emtel</name>
 		<gsm>
@@ -9305,8 +9330,8 @@
 	</provider>
 </country>
 
-<!-- Maldives -->
 <country code="mv">
+	<name>Maldives</name>
 	<provider>
 		<name>Dhiraagu</name>
 		<gsm>
@@ -9335,8 +9360,8 @@
 	</provider>
 </country>
 
-<!-- Malawi -->
 <country code="mw">
+	<name>Malawi</name>
 	<provider>
 		<name>Airtel MW</name>
 		<gsm>
@@ -9367,8 +9392,8 @@
 	</provider>
 </country>
 
-<!-- Mexico -->
 <country code="mx">
+	<name>Mexico</name>
 	<provider>
 		<name>Telcel</name>
 		<gsm>
@@ -9419,8 +9444,8 @@
 	</provider>
 </country>
 
-<!-- Malaysia -->
 <country code="my">
+	<name>Malaysia</name>
 	<provider>
 		<name>DiGi</name>
 		<gsm>
@@ -9510,8 +9535,8 @@
 	</provider>
 </country>
 
-<!-- Mozambique -->
 <country code="mz">
+	<name>Mozambique</name>
 	<provider>
 		<name>MCel</name>
 		<gsm>
@@ -9555,8 +9580,8 @@
 	</provider>
 </country>
 
-<!-- Namibia -->
 <country code="na">
+	<name>Namibia</name>
 	<provider>
 		<name>MTC</name>
 		<gsm>
@@ -9603,8 +9628,8 @@
 	</provider>
 </country>
 
-<!-- Nigeria -->
 <country code="ng">
+	<name>Nigeria</name>
 	<provider>
 		<name>Airtel NG</name>
 		<!-- http://www.airtel.com/wps/wcm/connect/africaairtel/nigeria/3g/home/3gpower/PG_Internet_Settings -->
@@ -9710,8 +9735,8 @@
 	</provider>
 </country>
 
-<!-- Nicaragua -->
 <country code="ni">
+	<name>Nicaragua</name>
 	<provider>
 		<name>Claro</name>
 		<gsm>
@@ -9761,8 +9786,8 @@
 	</provider>
 </country>
 
-<!-- Netherlands -->
 <country code="nl">
+	<name>Netherlands</name>
 	<provider>
 		<name>Hi</name>
 		<gsm>
@@ -10022,8 +10047,8 @@
 	</provider>
 </country>
 
-<!-- Norway -->
 <country code="no">
+	<name>Norway</name>
 	<provider>
 		<name>Netcom</name>
 		<gsm>
@@ -10250,8 +10275,8 @@
 	</provider>
 </country>
 
-<!-- Nepal -->
 <country code="np">
+	<name>Nepal</name>
 	<provider>
 		<name>Nepal Telecom</name>
 		<gsm>
@@ -10274,8 +10299,8 @@
 	</provider>
 </country>
 
-<!-- New Zealand -->
 <country code="nz">
+	<name>New Zealand</name>
 	<provider>
 		<name>Telecom New Zealand</name>
 		<gsm>
@@ -10384,8 +10409,8 @@
 	</provider>
 </country>
 
-<!-- Oman -->
 <country code="om">
+	<name>Oman</name>
 	<provider>
 		<name>Oman Mobile</name>
 		<gsm>
@@ -10431,8 +10456,8 @@
 	</provider>
 </country>
 
-<!-- Panama -->
 <country code="pa">
+	<name>Panama</name>
 	<provider>
 		<name>Cable and Wireless</name>
 		<gsm>
@@ -10465,8 +10490,8 @@
 	</provider>
 </country>
 
-<!-- Peru -->
 <country code="pe">
+	<name>Peru</name>
 	<provider>
 		<name>Claro</name>
 		<gsm>
@@ -10516,8 +10541,8 @@
 	</provider>
 </country>
 
-<!-- French Polynesia -->
 <country code="pf">
+	<name>French Polynesia</name>
 	<provider>
 		<name>Vini</name>
 		<gsm>
@@ -10530,8 +10555,8 @@
 	</provider>
 </country>
 
-<!-- Papua New Guinea -->
 <country code="pg">
+	<name>Papua New Guinea</name>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
@@ -10547,8 +10572,8 @@
 	</provider>
 </country>
 
-<!-- Philippines -->
 <country code="ph">
+	<name>Philippines</name>
 	<provider>
 		<name>Globe Telecom</name>
 		<gsm>
@@ -10626,24 +10651,12 @@
 	</provider>
 </country>
 
-<!-- Pakistan -->
 <country code="pk">
-	<provider>
-		<name>Djuice</name>
-		<gsm>
-			<network-id mcc="515" mnc="06"/>
-			<apn value="internet">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<username>telenor</username>
-				<password>telenor</password>
-			</apn>
-		</gsm>
-	</provider>
+	<name>Pakistan</name>
 	<provider>
 		<name>Mobilink</name>
 		<gsm>
-			<network-id mcc="515" mnc="01"/>
+			<network-id mcc="410" mnc="01"/>
 			<apn value="connect.mobilinkworld.com">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
@@ -10659,7 +10672,7 @@
 	<provider>
 		<name>Telenor</name>
 		<gsm>
-			<network-id mcc="515" mnc="06"/>
+			<network-id mcc="410" mnc="06"/>
 			<apn value="internet">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
@@ -10691,7 +10704,7 @@
 	<provider>
 		<name>Warid</name>
 		<gsm>
-			<network-id mcc="515" mnc="07"/>
+			<network-id mcc="410" mnc="07"/>
 			<apn value="warid">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
@@ -10707,7 +10720,7 @@
 	<provider>
 		<name>ZONG</name>
 		<gsm>
-			<network-id mcc="515" mnc="04"/>
+			<network-id mcc="410" mnc="04"/>
 			<apn value="zonginternet">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
@@ -10727,8 +10740,8 @@
 	</provider>
 </country>
 
-<!-- Poland -->
 <country code="pl">
+	<name>Poland</name>
 	<!-- Polish physical operators -->
 	<provider primary="true">
 		<name>T-Mobile</name>
@@ -11110,8 +11123,8 @@
 	</provider>
 </country>
 
-<!-- Portugal -->
 <country code="pt">
+	<name>Portugal</name>
 	<provider>
 		<name>Kanguru</name>
 		<gsm>
@@ -11283,8 +11296,8 @@
 	</provider>
 </country>
 
-<!-- Paraguay -->
 <country code="py">
+	<name>Paraguay</name>
 	<provider>
 		<name>VOX</name>
 		<gsm>
@@ -11341,8 +11354,8 @@
 	</provider>
 </country>
 
-<!-- Qatar -->
 <country code="qa">
+	<name>Qatar</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -11385,8 +11398,8 @@
 	</provider>
 </country>
 
-<!-- Réunion (France) -->
 <country code="re">
+	<name>Réunion (France)</name>
 	<provider>
 		<name>SFR Réunion</name>
 		<gsm>
@@ -11426,8 +11439,8 @@
 	</provider>
 </country>
 
-<!-- Romania -->
 <country code="ro">
+	<name>Romania</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -11532,8 +11545,8 @@
 
 </country>
 
-<!-- Serbia -->
 <country code="rs">
+	<name>Serbia</name>
 	<provider>
 		<name>Telenor</name>
 		<gsm>
@@ -11595,8 +11608,8 @@
 	</provider>
 </country>
 
-<!-- Rwanda -->
 <country code="rw">
+	<name>Rwanda</name>
 	<provider>
 		<name>MTN</name>
 		<gsm>
@@ -11619,30 +11632,8 @@
 	</provider>
 </country>
 
-<!-- Russia -->
 <country code="ru">
-	<provider>
-		<name>BaikalWestCom</name>
-		<name xml:lang="ru">БайкалВестКом</name>
-		<gsm>
-			<network-id mcc="250" mnc="12"/>
-			<apn value="inet.bwc.ru">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<username>bwc</username>
-				<password>bwc</password>
-				<dns>81.18.113.2</dns>
-				<dns>81.18.112.50</dns>
-			</apn>
-			<apn value="mms.bwc.ru">
-				<usage type="mms"/>
-				<name>MMS</name>
-				<username>bwc</username>
-				<mmsc>http://mmsc/mms</mmsc>
-				<mmsproxy>10.10.17.2:9201</mmsproxy>
-			</apn>
-		</gsm>
-	</provider>
+	<name>Russia</name>
 	<provider>
 		<name>Beeline</name>
 		<name xml:lang="ru">Билайн</name>
@@ -11675,16 +11666,6 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>ETK</name>
-		<gsm>
-			<network-id mcc="250" mnc="05"/>
-			<apn value="wap.etk.ru">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-			</apn>
-		</gsm>
-	</provider>
-	<provider>
 		<name>MTS</name>
 		<gsm>
 			<network-id mcc="250" mnc="01"/>
@@ -11694,6 +11675,7 @@
 			<apn value="internet.mts.ru">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
+				<name>MTS internet</name>
 				<username>mts</username>
 				<password>mts</password>
 				<dns>213.87.0.1</dns>
@@ -11702,6 +11684,26 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>Gazprombank Mobile</name>
+		<name xml:lang="ru">Газпромбанк Мобайл</name>
+		<gsm>
+			<network-id mcc="250" mnc="45"/>
+			<apn value="gpb">
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Letai</name>
+		<name xml:lang="ru">Летай</name>
+		<gsm>
+			<network-id mcc="250" mnc="27"/>
+			<apn value="internet.letai.ru">
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Megafon</name>
 		<name xml:lang="ru">Мегафон</name>
 
@@ -11729,19 +11731,6 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>NCC</name>
-		<gsm>
-			<network-id mcc="250" mnc="03"/>
-			<apn value="internet">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<username>ncc</username>
-				<dns>10.0.3.5</dns>
-				<dns>10.0.3.2</dns>
-			</apn>
-		</gsm>
-	</provider>
-	<provider>
 		<name>NTC</name>
 		<gsm>
 			<network-id mcc="250" mnc="16"/>
@@ -11760,20 +11749,6 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Enisey TeleCom</name>
-		<name xml:lang="ru">Енисей Телеком</name>
-		<gsm>
-			<network-id mcc="250" mnc="05"/>
-			<apn value="internet.etk.ru">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<username>etk</username>
-				<dns>10.10.30.3</dns>
-				<dns>10.10.30.4</dns>
-			</apn>
-		</gsm>
-	</provider>
-	<provider>
 		<name>Motiv</name>
 		<name xml:lang="ru">Мотив</name>
 		<gsm>
@@ -11781,27 +11756,15 @@
 			<apn value="inet.ycc.ru">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
+				<name>MOTIV</name>
 				<username>motiv</username>
+				<password>motiv</password>
 				<dns>217.148.52.34</dns>
 				<dns>217.148.52.3</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Tatincom</name>
-		<name xml:lang="ru">Татинком</name>
-		<gsm>
-			<apn value="internet.tatincom.ru">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<username>tatincom</username>
-				<password>tatincom</password>
-				<dns>89.207.96.2</dns>
-				<dns>89.207.97.18</dns>
-			</apn>
-		</gsm>
-	</provider>
-	<provider>
 		<name>Tele2</name>
 		<name xml:lang="ru">Теле2</name>
 		<gsm>
@@ -11809,12 +11772,45 @@
 			<apn value="internet.tele2.ru">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
+				<name>TELE2 internet</name>
 				<dns>130.244.127.161</dns>
 				<dns>130.244.127.169</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
+		<name>Phoenix</name>
+		<name xml:lang="ru">Феникс</name>
+		<gsm>
+			<network-id mcc="250" mnc="97"/>
+			<apn value="internet">
+				<usage type="internet"/>
+				<name>Phoenix</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>SberMobile</name>
+		<name xml:lang="ru">СберМобайл</name>
+		<gsm>
+			<network-id mcc="250" mnc="50"/>
+			<apn value="internet.sberbank-tele.com">
+				<usage type="internet"/>
+				<name>SberMobile Internet</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>STS</name>
+		<name xml:lang="ru">СТС</name>
+		<gsm>
+			<network-id mcc="250" mnc="33"/>
+			<apn value="internet.sts.ru">
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Skylink</name>
 		<name xml:lang="ru">Скайлинк</name>
 		<cdma>
@@ -11916,21 +11912,34 @@
 		</cdma>
 	</provider>
 	<provider>
-		<name>U-tel</name>
+		<name>Tinkoff Mobile</name>
+		<name xml:lang="ru">Тинькофф Мобайл</name>
 		<gsm>
-			<network-id mcc="250" mnc="39"/>
-			<balance-check>
-				<ussd>*100#</ussd>
-			</balance-check>
-			<apn value="internet.usi.ru">
-				<plan type="postpaid"/>
+			<network-id mcc="250" mnc="62"/>
+			<apn value="m.tinkoff">
 				<usage type="internet"/>
 			</apn>
-			<apn value="mnc039.mcc250.gprs">
-				<usage type="mms"/>
-				<name>mms</name>
-				<mmsc>mms.usi.ru</mmsc>
-				<mmsproxy>192.168.168.192:8080</mmsproxy>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Vainah Telecom</name>
+		<name xml:lang="ru">Вайнах Телеком</name>
+		<gsm>
+			<network-id mcc="250" mnc="08"/>
+			<apn value="vtk">
+				<usage type="internet"/>
+				<name>vtk</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>VTB Mobile</name>
+		<name xml:lang="ru">ВТБ Мобайл</name>
+		<gsm>
+			<network-id mcc="250" mnc="26"/>
+			<apn value="VTB">
+				<usage type="internet"/>
+				<name>VTB</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -11954,8 +11963,8 @@
 	</provider>
 </country>
 
-<!-- Saudi Arabia -->
 <country code="sa">
+	<name>Saudi Arabia</name>
 	<provider>
 		<name>Mobily</name>
 		<gsm>
@@ -12015,8 +12024,8 @@
 </country>
 
 
-<!-- Sweden -->
 <country code="se">
+	<name>Sweden</name>
 	<provider primary="true">
 		<name>3</name>
 		<gsm>
@@ -12266,8 +12275,8 @@
 	</provider>
 </country>
 
-<!-- Singapore -->
 <country code="sg">
+	<name>Singapore</name>
 	<provider>
 		<name>M1</name>
 		<gsm>
@@ -12373,8 +12382,8 @@
 	</provider>
 </country>
 
-<!-- Slovenia -->
 <country code="si">
+	<name>Slovenia</name>
 	<provider>
 		<name>Mobitel</name>
 		<gsm>
@@ -12459,8 +12468,8 @@
 	</provider>
 </country>
 
-<!-- Slovakia -->
 <country code="sk">
+	<name>Slovakia</name>
 	<provider>
 		<name>Slovak Telekom</name>
 		<gsm>
@@ -12515,8 +12524,8 @@
 	</provider>
 </country>
 
-<!-- Senegal -->
 <country code="sn">
+	<name>Senegal</name>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
@@ -12531,8 +12540,8 @@
 	</provider>
 </country>
 
-<!-- El Salvador -->
 <country code="sv">
+	<name>El Salvador</name>
 	<provider>
 		<name>Movistar</name>
 		<gsm>
@@ -12584,8 +12593,8 @@
 	</provider>
 </country>
 
-<!-- Sudan -->
 <country code="sd">
+	<name>Sudan</name>
 	<provider>
 		<name>Zain</name>
 		<gsm>
@@ -12632,8 +12641,8 @@
 	</provider>
 </country>
 
-<!-- Thailand -->
 <country code="th">
+	<name>Thailand</name>
 	<provider>
 		<name>AIS</name>
 		<gsm>
@@ -12724,8 +12733,8 @@
 	</provider>
 </country>
 
-<!-- Tunisia -->
 <country code="tn">
+	<name>Tunisia</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -12825,8 +12834,8 @@
 	</provider>
 </country>
 
-<!-- Turkey -->
 <country code="tr">
+	<name>Turkey</name>
 	<provider>
 		<name>Avea</name>
 		<gsm>
@@ -12912,8 +12921,8 @@
 	</provider>
 </country>
 
-<!-- Trinidad & Tobago -->
 <country code="tt">
+	<name>Trinidad and Tobago</name>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
@@ -12954,8 +12963,8 @@
 	</provider>
 </country>
 
-<!-- Taiwan -->
 <country code="tw">
+	<name>Taiwan</name>
 	<provider>
 		<name>Chunghwa Telecom (emome)</name>
 		<name xml:lang="zh">中華電信 (emome)</name>
@@ -13055,8 +13064,8 @@
 	</provider>
 </country>
 
-<!-- Tanzania, United Republic of -->
 <country code="tz">
+	<name>Tanzania</name>
 	<provider>
 		<name>Airtel Tanzania</name>
 		<gsm>
@@ -13116,8 +13125,8 @@
 	</provider>
 </country>
 
-<!-- Ukraine -->
 <country code="ua">
+	<name>Ukraine</name>
 	<provider>
 		<name>kyivstar</name>
 		<gsm>
@@ -13301,8 +13310,8 @@
 	</provider>
 </country>
 
-<!-- Uganda -->
 <country code="ug">
+	<name>Uganda</name>
 	<provider>
 		<name>MTN</name>
 		<gsm>
@@ -13373,10 +13382,62 @@
 			</apn>
 		</gsm>
 	</provider>
+
+	<!-- Operators below use Russia's country code, but operate in
+	     a territory that's part of Ukraine. -->
+	<provider>
+		<name>+7Telecom</name>
+		<name xml:lang="ru">+7Телеком</name>
+		<gsm>
+			<network-id mcc="250" mnc="96"/>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<apn value="internet ">
+				<usage type="internet"/>
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Krymtelekom</name>
+		<name xml:lang="ru">Крымтелеком</name>
+		<gsm>
+			<network-id mcc="250" mnc="34"/>
+			<apn value="internet.ktkru.ru">
+				<usage type="internet"/>
+				<name>KTK</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Volna mobile</name>
+		<name xml:lang="ru">Волна мобайл</name>
+		<gsm>
+			<network-id mcc="250" mnc="60"/>
+			<apn value="internet">
+				<usage type="internet"/>
+				<name>internet</name>
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Win Mobile</name>
+		<gsm>
+			<network-id mcc="250" mnc="32"/>
+			<apn value="internet">
+				<usage type="internet"/>
+				<name>internet</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
-<!-- United States -->
 <country code="us">
+	<name>United States</name>
 	<provider>
 		<name>AT&amp;T</name>
 		<gsm>
@@ -13428,6 +13489,12 @@
 				<usage type="mms-internet-hipri-fota"/>
 				<name>ATT Broadband</name>
 			</apn>
+			<apn value="RESELLER">
+				<usage type="mms-internet-hipri"/>
+				<name>RESELLER</name>
+				<mmsc>http://mmsc.mobile.att.net</mmsc>
+				<mmsproxy>proxy.mobile.att.net:80</mmsproxy>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -14352,8 +14419,8 @@
 	</provider>
 </country>
 
-<!-- Uruguay -->
 <country code="uy">
+	<name>Uruguay</name>
 	<provider>
 		<name>Ancel</name>
 		<gsm>
@@ -14430,8 +14497,8 @@
 	</provider>
 </country>
 
-<!-- Uzbekistan -->
 <country code="uz">
+	<name>Uzbekistan</name>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
@@ -14468,8 +14535,8 @@
 	</provider>
 </country>
 
-<!-- St Vincent -->
 <country code="vc">
+	<name>St Vincent</name>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
@@ -14484,8 +14551,8 @@
 	</provider>
 </country>
 
-<!-- Venezuela -->
 <country code="ve">
+	<name>Venezuela</name>
 	<provider>
 		<name>Digitel TIM</name>
 		<gsm>
@@ -14537,8 +14604,8 @@
 	</provider>
 </country>
 
-<!-- Viet Nam -->
 <country code="vn">
+	<name>Viet Nam</name>
 	<provider>
 		<name>MobiFone</name>
 		<gsm>
@@ -14663,8 +14730,8 @@
 	</provider>
 </country>
 
-<!-- South Africa -->
 <country code="za">
+	<name>South Africa</name>
 	<provider>
 		<name>Cell-c</name>
 		<gsm>
@@ -14800,8 +14867,8 @@
 	</provider>
 </country>
 
-<!-- Eswatini (Swaziland) -->
 <country code="sz">
+	<name>Eswatini</name>
 	<provider>
 		<name>MTN Eswatini</name>
 		<gsm>
@@ -14842,8 +14909,8 @@
 	</provider>
 </country>
 
-<!-- Kosovo -->
 <country code="xk">
+	<name>Kosovo</name>
 	<provider>
 		<name>IPKO</name>
 		<gsm>