diff -Nru mobile-broadband-provider-info-20240407/debian/changelog mobile-broadband-provider-info-20250613/debian/changelog
--- mobile-broadband-provider-info-20240407/debian/changelog	2024-08-12 18:42:36.000000000 +0200
+++ mobile-broadband-provider-info-20250613/debian/changelog	2025-07-05 11:40:30.000000000 +0200
@@ -1,3 +1,19 @@
+mobile-broadband-provider-info (20250613-2) unstable; urgency=medium
+
+  * Upload to unstable
+
+ -- Graham Inggs <ginggs@debian.org>  Sat, 05 Jul 2025 09:40:30 +0000
+
+mobile-broadband-provider-info (20250613-1) experimental; urgency=medium
+
+  * Upload to experimental
+  * New upstream version 20250613
+    (Closes: #1107974)
+  * Add salsa-ci
+  * Add myself to uploaders. Thanks Graham!
+
+ -- Guido Günther <agx@sigxcpu.org>  Sat, 21 Jun 2025 14:51:27 +0200
+
 mobile-broadband-provider-info (20240407-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru mobile-broadband-provider-info-20240407/debian/control mobile-broadband-provider-info-20250613/debian/control
--- mobile-broadband-provider-info-20240407/debian/control	2024-08-12 18:24:02.000000000 +0200
+++ mobile-broadband-provider-info-20250613/debian/control	2025-07-05 11:27:57.000000000 +0200
@@ -2,6 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Graham Inggs <ginggs@debian.org>
+Uploaders: Guido Günther <agx@sigxcpu.org>
 Build-Depends: debhelper-compat (= 13),
                libxml2-utils,
                meson (>= 1.0.0),
diff -Nru mobile-broadband-provider-info-20240407/debian/salsa-ci.yml mobile-broadband-provider-info-20250613/debian/salsa-ci.yml
--- mobile-broadband-provider-info-20240407/debian/salsa-ci.yml	1970-01-01 01:00:00.000000000 +0100
+++ mobile-broadband-provider-info-20250613/debian/salsa-ci.yml	2025-07-05 11:27:57.000000000 +0200
@@ -0,0 +1,7 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+  SALSA_CI_DISABLE_PIUPARTS: 1
diff -Nru mobile-broadband-provider-info-20240407/.dir-locals.el mobile-broadband-provider-info-20250613/.dir-locals.el
--- mobile-broadband-provider-info-20240407/.dir-locals.el	1970-01-01 01:00:00.000000000 +0100
+++ mobile-broadband-provider-info-20250613/.dir-locals.el	2025-06-18 11:11:11.000000000 +0200
@@ -0,0 +1,7 @@
+(
+ (nxml-mode . (
+               (indent-tabs-mode . t)
+               (nxml-child-indent . 8)
+               (nxml-outline-child-indent . 8)
+               ))
+)
diff -Nru mobile-broadband-provider-info-20240407/MAINTAINERS mobile-broadband-provider-info-20250613/MAINTAINERS
--- mobile-broadband-provider-info-20240407/MAINTAINERS	2024-05-02 08:44:11.000000000 +0200
+++ mobile-broadband-provider-info-20250613/MAINTAINERS	2025-06-18 11:11:11.000000000 +0200
@@ -1,11 +1,3 @@
-Antti Kaijanmäki
-E-mail: antti.kaijanmaki.net
-Userid: kaijanma
-
-Dan Williams
-E-mail: dcbw@redhat.com
-Userid: dcbw
-
 Lubomir Rintel
 E-mail: lkundrak@v3.sk
 Userid: lkundrak
diff -Nru mobile-broadband-provider-info-20240407/meson.build mobile-broadband-provider-info-20250613/meson.build
--- mobile-broadband-provider-info-20240407/meson.build	2024-05-02 08:44:11.000000000 +0200
+++ mobile-broadband-provider-info-20250613/meson.build	2025-06-18 11:11:11.000000000 +0200
@@ -47,4 +47,4 @@
 
 test('xmllint',
      find_program('xmllint'),
-     args: ['--valid', sp_xml_db])
+     args: ['--postvalid', sp_xml_db])
diff -Nru mobile-broadband-provider-info-20240407/mobile-broadband-provider-info.doap mobile-broadband-provider-info-20250613/mobile-broadband-provider-info.doap
--- mobile-broadband-provider-info-20240407/mobile-broadband-provider-info.doap	2024-05-02 08:44:11.000000000 +0200
+++ mobile-broadband-provider-info-20250613/mobile-broadband-provider-info.doap	2025-06-18 11:11:11.000000000 +0200
@@ -14,13 +14,6 @@
   <!-- Maintainers -->
   <maintainer>
     <foaf:Person>
-      <foaf:name>Antti Kaijanmäki</foaf:name>
-      <foaf:mbox rdf:resource="mailto:antti.kaijanmaki.net"/>
-      <gnome:userid>kaijanma</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-  <maintainer>
-    <foaf:Person>
       <foaf:name>Dan Williams</foaf:name>
       <foaf:mbox rdf:resource="mailto:dcbw@redhat.com" />
       <gnome:userid>dcbw</gnome:userid>
diff -Nru mobile-broadband-provider-info-20240407/NEWS mobile-broadband-provider-info-20250613/NEWS
--- mobile-broadband-provider-info-20240407/NEWS	2024-05-02 08:44:11.000000000 +0200
+++ mobile-broadband-provider-info-20250613/NEWS	2025-06-18 11:11:11.000000000 +0200
@@ -1,3 +1,25 @@
+20250613
+--------
+* Add support for Cell Broadcast channel information to schema
+* Add channel information for NL, DE, US
+* New providers
+  - de: sipgate
+  - dk: Telia IOT
+  - pt: Digi PT, LigaT
+  - pt: Meo, NOS
+  - uk: 1pMobile
+  - us: AT&T FirstNet
+* Updated providers:
+  - at: spusu
+  - de: Bild Mobil, congstar
+  - fr: bouygues
+  - it: Iliad
+  - pt: Vodafone, NOS, Lycamobile, Meo
+  - ru: Win Mobile
+  - us: T-mobile
+* Removed providers:
+  - pt: ZON, TMN, CLIX, Optimus, Kanguru
+
 20240407
 --------
 * Switch to meson
diff -Nru mobile-broadband-provider-info-20240407/serviceproviders.2.dtd mobile-broadband-provider-info-20250613/serviceproviders.2.dtd
--- mobile-broadband-provider-info-20240407/serviceproviders.2.dtd	2024-05-02 08:44:11.000000000 +0200
+++ mobile-broadband-provider-info-20250613/serviceproviders.2.dtd	2025-06-18 11:11:11.000000000 +0200
@@ -1,7 +1,7 @@
 <!ELEMENT serviceproviders (country*)>
 <!ATTLIST serviceproviders format CDATA #REQUIRED>
 
-<!ELEMENT country (name+, provider*)>
+<!ELEMENT country (name+, cbs*, provider*)>
 <!ATTLIST country code CDATA #REQUIRED>
 
 <!ELEMENT provider (name+, gsm?, cdma?)>
@@ -148,3 +148,15 @@
 
 <!-- Maximum Size an MMS can be, in bytes -->
 <!ELEMENT mmsattachmentsize (#PCDATA)>
+
+<!-- A countries cell broadcast service information -->
+<!ELEMENT cbs (level+)>
+
+<!-- Information about a particular severity level -->
+<!ELEMENT level (channels+)>
+<!ATTLIST level type (presidential|extreme|severe|public-safety|amber|test) #REQUIRED>
+
+<!-- The channels for this alert level -->
+<!ELEMENT channels EMPTY>
+<!ATTLIST channels start CDATA #REQUIRED>
+<!ATTLIST channels end CDATA #REQUIRED>
diff -Nru mobile-broadband-provider-info-20240407/serviceproviders.xml mobile-broadband-provider-info-20250613/serviceproviders.xml
--- mobile-broadband-provider-info-20240407/serviceproviders.xml	2024-05-02 08:44:11.000000000 +0200
+++ mobile-broadband-provider-info-20250613/serviceproviders.xml	2025-06-18 11:11:11.000000000 +0200
@@ -600,6 +600,16 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>Spusu</name>
+		<gsm>
+			<network-id mcc="232" mnc="17"/>
+			<apn value="web">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="232" mnc="03"/>
@@ -3250,6 +3260,42 @@
 
 <country code="de">
 	<name>Germany</name>
+	<cbs>
+		<!-- MoWaS-Warnmeldungen der „Warnstufe 1, hoch“ -->
+		<level type="presidential">
+			<channels start="4370" end="4370"/>
+			<channels start="4383" end="4383"/>
+			<!-- Per DE-Alert -->
+			<channels start="919" end="919"/>
+		</level>
+		<!-- MoWaS-Warnmeldungen der „Warnstufe 2, mittel“ -->
+		<level type="extreme">
+			<channels start="4371" end="4371"/>
+			<channels start="4384" end="4384"/>
+			<channels start="4385" end="4385"/>
+		</level>
+		<level type="severe">
+			<channels start="4373" end="4378"/>
+			<channels start="4386" end="4391"/>
+		</level>
+		<!-- MoWaS-Warnmeldungen der „Warnstufe 3, niedrig“ -->
+		<level type="public-safety">
+			<channels start="4396" end="4396"/>
+			<channels start="4397" end="4397"/>
+		</level>
+		<level type="amber">
+			<channels start="4379" end="4379"/>
+			<channels start="4392" end="4392"/>
+		</level>
+		<level type="test">
+			<!-- EU monthly test -->
+			<channels start="4380" end="4380"/>
+			<!-- EU test -->
+			<channels start="4382" end="4382"/>
+			<!-- EU exercise -->
+			<channels start="4381" end="4381"/>
+		</level>
+	</cbs>
 	<provider>
 		<name>AldiTalk/MedionMobile</name>
 		<gsm>
@@ -3314,9 +3360,9 @@
 	<provider>
 		<name>Bild Mobil</name>
 		<gsm>
-			<!-- http://www.bildmobil.de/info_handyeinstellungen.html -->
+			<!-- https://www.bildmobil.de/APN.html -->
 			<network-id mcc="262" mnc="02"/>
-			<apn value="access.vodafone.de">
+			<apn value="web.vodafone.de">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
 				<name>BILD Mobilportal</name>
@@ -3521,15 +3567,25 @@
 			<balance-top-up>
 				<ussd replacement="CODE">*101*CODE#</ussd>
 			</balance-top-up>
-			<apn value="internet.t-mobile">
+			<apn value="internet.telekom">
 				<plan type="prepaid"/>
 				<usage type="internet"/>
 				<name>Prepaid Contracts</name>
-				<username>t-mobile</username>
-				<password>tm</password>
+				<username>congstar</username>
+				<password>cs</password>
 				<dns>193.254.160.1</dns>
 				<dns>10.74.83.22</dns>
 			</apn>
+			<!-- https://forum.congstar.de/thread/46325-mobil-surfen-mit-congstar-manuelle-einstellungen-zum-mobilen-internet-apn/ !-->
+			<apn value="internet.telekom">
+				<plan type="prepaid"/>
+				<usage type="mms"/>
+				<name>Congstar MMS</name>
+				<username>telekom</username>
+				<password>telekom</password>
+				<mmsc>https://www.mms.telekon.de/OTP/</mmsc>
+				<mmsproxy>109.231.176.193:8008</mmsproxy>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3607,6 +3663,20 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>sipgate</name>
+		<gsm>
+			<network-id mcc="262" mnc="03"/> <!-- this value is listed in the sipgate forum, presuambly an MVNO of this provider!-->
+			<network-id mcc="262" mnc="33"/>
+			<apn value="sipgate">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>sipgate</name>
+				<username>sipgate</username>
+				<password>sipgate</password>
+		</apn>
+	</gsm>
+	</provider>
+	<provider>
 		<name>Alice</name>
 		<gsm>
 			<network-id mcc="262" mnc="07"/>
@@ -3859,6 +3929,19 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>Telia IOT</name>
+		<gsm>
+			<network-id mcc="238" mnc="20"/>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<apn value="www.internet.mtelia.dk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>BiBoB</name>
 		<gsm>
 			<network-id mcc="238" mnc="02"/>
@@ -4805,6 +4888,11 @@
 			<network-id mcc="208" mnc="21"/>
 
 			<voicemail>660</voicemail>
+			<visual-voicemail>
+				<standard type="vvm3"/>
+				<destination-number>22344</destination-number>
+				<carrier-prefix>//VVM</carrier-prefix>
+			</visual-voicemail>
 			<balance-check>
 				<dtmf>630</dtmf>
 			</balance-check>
@@ -5460,6 +5548,32 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider primary="false">
+		<!-- https://www.1pmobile.com/ask-penny/?help=data-and-internet -->
+		<name>1pMobile</name>
+		<gsm>
+			<!-- 1pMobile is MVNO with same MCC/MNC as EE -->
+			<network-id mcc="234" mnc="30"/>
+			<balance-check>
+				<dtmf>150</dtmf>
+			</balance-check>
+			<apn value="data.uk">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>1pMobile</name>
+				<username>user</username>
+				<password>one2one</password>
+			</apn>
+			<apn value="data.uk">
+				<usage type="mms"/>
+				<name>1pMobile</name>
+				<username>user</username>
+				<password>one2one</password>
+				<mmsc>http://mms/</mmsc>
+				<mmsproxy>149.254.201.135:8080</mmsproxy>
+			</apn>
+		</gsm>
+	</provider>
 	<provider>
 		<name>3</name>
 		<gsm>
@@ -7335,6 +7449,15 @@
 		<name>Iliad</name>
 		<gsm>
 			<network-id mcc="222" mnc="50"/>
+			<voicemail>401</voicemail>
+			<visual-voicemail>
+				<standard type="ios"/>
+				<destination-number>2050</destination-number>
+				<carrier-prefix>//VVM</carrier-prefix>
+			</visual-voicemail>
+			<balance-check>
+				<sms text="Credito">400</sms>
+			</balance-check>
 			<apn value="iliad">
 				<plan type="prepaid"/>
 				<usage type="internet"/>
@@ -9564,6 +9687,39 @@
 
 <country code="nl">
 	<name>Netherlands</name>
+	<cbs>
+		<level type="presidential">
+			<channels start="4370" end="4370"/>
+			<channels start="4383" end="4383"/>
+			<!-- legacy block -->
+			<channels start="919" end="919"/>
+		</level>
+		<level type="extreme">
+			<channels start="4371" end="4371"/>
+			<channels start="4384" end="4384"/>
+			<channels start="4385" end="4385"/>
+		</level>
+		<level type="severe">
+			<channels start="4373" end="4378"/>
+			<channels start="4386" end="4391"/>
+		</level>
+		<level type="public-safety">
+			<channels start="4396" end="4396"/>
+			<channels start="4397" end="4397"/>
+		</level>
+		<level type="amber">
+			<channels start="4379" end="4379"/>
+			<channels start="4392" end="4392"/>
+		</level>
+		<level type="test">
+			<!-- EU monthly test -->
+			<channels start="4380" end="4380"/>
+			<!-- EU test -->
+			<channels start="4382" end="4382"/>
+			<!-- EU exercise -->
+			<channels start="4381" end="4381"/>
+		</level>
+	</cbs>
 	<provider>
 		<name>Hi</name>
 		<gsm>
@@ -10902,76 +11058,41 @@
 <country code="pt">
 	<name>Portugal</name>
 	<provider>
-		<name>Kanguru</name>
+		<name>NOS</name>
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
-			<apn value="kanguru-portatil">
+			<voicemail>133</voicemail>
+			<balance-check>
+				<ussd>*111#</ussd>
+			</balance-check>
+			<apn value="utms">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
-				<name>Portable</name>
-				<name xml:lang="pt">Portátil</name>
-				<dns>62.169.67.172</dns>
-				<dns>62.169.67.171</dns>
+				<name>NOS / WTF Pós-Pago (internet)</name>
 			</apn>
-			<apn value="kanguru-tempo">
+			<apn value="utms">
 				<plan type="prepaid"/>
 				<usage type="internet"/>
-				<name>Tempo (Prepaid)</name>
-				<dns>62.169.67.172</dns>
-				<dns>62.169.67.171</dns>
+				<name>NOS / WTF Pré-Pago (internet)</name>
 			</apn>
-			<apn value="kangurufixo">
+			<apn value="myconnection">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
-				<name>Fixo</name>
-				<dns>62.169.67.172</dns>
-				<dns>62.169.67.171</dns>
-			</apn>
-			<apn value="noapn">
-				<name>Apn dinâmico (no apn)</name>
-				<dns>62.169.67.172</dns>
-				<dns>62.169.67.171</dns>
+				<name>NOS Kanguru Net Móvel (internet)</name>
 			</apn>
 			<apn value="umts">
 				<usage type="mms"/>
-				<name>Optimus MMS</name>
+				<name>NOS (MMS)</name>
 				<mmsc>http://mmsc:10021/mmsc</mmsc>
 				<mmsproxy>62.169.66.5:8799</mmsproxy>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<!-- Merged with Optimus in 2010 -->
-		<name>Clix</name>
-		<gsm>
-			<network-id mcc="268" mnc="03"/>
-			<apn value="clixinternetmovel">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-			</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Optimus</name>
-		<gsm>
-			<network-id mcc="268" mnc="03"/>
-			<apn value="umts">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<name>3G</name>
-			</apn>
-			<apn value="internet">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<name>GPRS</name>
-				<dns>194.79.69.129</dns>
-			</apn>
-		</gsm>
-	</provider>
-	<provider>
 		<name>Lycamobile</name>
 		<gsm>
 			<network-id mcc="268" mnc="04"/>
+			<voicemail>200</voicemail>
 			<balance-check>
 				<ussd>*123#</ussd>
 			</balance-check>
@@ -10987,32 +11108,24 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>TMN</name>
+		<name>MEO</name>
 		<gsm>
 			<network-id mcc="268" mnc="06"/>
+			<voicemail>200</voicemail>
+			<balance-check>
+				<ussd>*#123#</ussd>
+			</balance-check>
 			<apn value="internet">
+				<plan type="prepaid"/>
 				<plan type="postpaid"/>
 				<usage type="internet"/>
-				<name>Tmn Internet</name>
-				<username>tmn</username>
-				<password>tmn</password>
+				<name>MEO (Internet)</name>
 				<dns>88.214.178.1</dns>
 				<dns>88.214.182.2</dns>
 			</apn>
 			<apn value="mmsc.tmn.pt">
-				<plan type="postpaid"/>
 				<usage type="mms"/>
-				<name>Tmn Mms</name>
-				<username>tmn</username>
-				<password>tmnnet</password>
-				<dns>194.65.3.20</dns>
-				<dns>194.65.3.21</dns>
-			</apn>
-			<apn value="mmsc.tmn.pt">
-				<usage type="mms"/>
-				<name>MMSgprs</name>
-				<username>tmn</username>
-				<password>tmnnet</password>
+				<name>MEO (MMS)</name>
 				<mmsc>http://mmsc/</mmsc>
 				<mmsproxy>10.111.2.16:8080</mmsproxy>
 			</apn>
@@ -11022,51 +11135,56 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="268" mnc="01"/>
+			<voicemail>123</voicemail>
+			<balance-check>
+				<ussd>*#123#</ussd>
+			</balance-check>
 			<apn value="internet.vodafone.pt">
 				<plan type="postpaid"/>
+				<plan type="prepaid"/>
 				<usage type="internet"/>
 				<username>vodafone</username>
 				<password>vodafone</password>
-				<dns>212.18.160.133</dns>
-				<dns>212.18.160.134</dns>
 			</apn>
 			<apn value="net2.vodafone.pt">
+				<plan type="prepaid"/>
 				<plan type="postpaid"/>
 				<usage type="internet"/>
-				<name>Vodafone Internet</name>
+				<name>Vodafone / Yorn (Internet)</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
 			</apn>
-			<apn value="vas.vodafone.pt">
-				<plan type="postpaid"/>
+			<apn value="net2.vodafone.pt">
 				<usage type="mms"/>
-				<name>Vodafone MMS</name>
-				<username>vas</username>
-				<password>vas</password>
+				<name>Vodafone / Yorn (MMS)</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<mmsc>http://mms.vodafone.pt/servlets/mms</mmsc>
+				<mmsproxy>iproxy.vodafone.pt:80</mmsproxy>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>ZON</name>
+		<name>Digi PT</name>
 		<gsm>
-			<network-id mcc="268" mnc="01"/>
-			<apn value="internet.zon.pt">
+			<network-id mcc="268" mnc="02"/>
+			<apn value="internet">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
-				<name>Dados Móveis</name>
+				<name>Digi.mobil</name>
+				<authentication method="pap"/>
 			</apn>
-			<apn value="vas.zon.pt">
+		</gsm>
+	</provider>
+	<provider>
+		<name>LigaT</name>
+		<gsm>
+			<network-id mcc="268" mnc="07"/>
+			<voicemail>200</voicemail>
+			<apn value="inet">
 				<plan type="postpaid"/>
-				<usage type="mms"/>
-				<name>MMS</name>
-				<username>vas</username>
-				<password>vas</password>
-			</apn>
-			<apn value="vas.zon.pt">
-				<usage type="mms"/>
-				<name>ZON MMS</name>
-				<username>vas</username>
-				<password>vas</password>
-				<mmsc>http://mms/servlets/mms</mmsc>
-				<mmsproxy>213.30.27.63:8799</mmsproxy>
+				<usage type="internet"/>
+				<name>LigaT (Internet)</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -13207,6 +13325,8 @@
 			<apn value="internet">
 				<usage type="internet"/>
 				<name>internet</name>
+				<username>internet</username>
+				<password>internet</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -13214,6 +13334,23 @@
 
 <country code="us">
 	<name>United States</name>
+	<cbs>
+		<level type="presidential">
+			<channels start="4370" end="4370"/>
+		</level>
+		<level type="extreme">
+			<channels start="4371" end="4372"/>
+		</level>
+		<level type="severe">
+			<channels start="4373" end="4378"/>
+		</level>
+		<level type="public-safety">
+			<channels start="4397" end="4397"/>
+		</level>
+		<level type="amber">
+			<channels start="4379" end="4379"/>
+		</level>
+	</cbs>
 	<provider>
 		<name>AT&amp;T</name>
 		<gsm>
@@ -13296,7 +13433,7 @@
 			<voicemail>123</voicemail>
 			<visual-voicemail>
 				<standard type="cvvm"/>
-				<destination-number>127</destination-number>
+				<destination-number>122</destination-number>
 				<carrier-prefix>//VVM</carrier-prefix>
 			</visual-voicemail>
 			<apn value="fast.t-mobile.com">
@@ -13353,6 +13490,40 @@
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>FirstNet</name>
+		<gsm>
+			<network-id mcc="312" mnc="670"/>
+			<network-id mcc="313" mnc="100"/>
+			<network-id mcc="313" mnc="110"/>
+			<network-id mcc="313" mnc="120"/>
+			<network-id mcc="313" mnc="130"/>
+			<network-id mcc="313" mnc="140"/>
+			<network-id mcc="313" mnc="150"/>
+			<network-id mcc="313" mnc="150"/>
+			<network-id mcc="313" mnc="160"/>
+			<network-id mcc="313" mnc="170"/>
+			<network-id mcc="313" mnc="180"/>
+			<network-id mcc="313" mnc="190"/>
+			<voicemail>+17249209990</voicemail>
+			<visual-voicemail>
+				<standard type="ios"/>
+				<destination-number>94183567</destination-number>
+				<carrier-prefix>//VVM</carrier-prefix>
+			</visual-voicemail>
+			<apn value="firstnet-phone">
+				<usage type="mms-internet-hipri"/>
+				<name>firstnet-phone</name>
+				<gateway>proxy.mobile.att.net:80</gateway>
+				<mmsc>http://mmsc.mobile.att.net</mmsc>
+				<mmsproxy>proxy.mobile.att.net:80</mmsproxy>
+			</apn>
+			<apn value="firstnet-broadband">
+				<usage type="mms-internet-hipri"/>
+				<name>firstnet-broadband</name>
+			</apn>
+		</gsm>
+	</provider>
 	<provider>
 		<name>Sprint</name>
 		<cdma>