diff --git a/gpon/ont.md b/gpon/ont.md
index a972b1f8..a05f7a00 100644
--- a/gpon/ont.md
+++ b/gpon/ont.md
@@ -7,36 +7,58 @@ nav_order: 2
 
 # Major Chipset Manufacturers
 
-Currently, there are only a few main GPON chipset vendors:
+Currently, there are only a few main PON chipset vendors:
 
 - Realtek:
-    * RTL9601 series (for ONT)
-        - RTL9601B  
-        - RTL9601CI (HSGMII)
+    * RTL9601 series (for SFU ONT and SFP ONT)
+        - RTL9601B
+        - RTL9601C (End Of Life)
+        - RTL9601CI (HSGMII, End Of Life)
         - RTL9601D (HSGMII)
     * RTL9602/RTL9603 series (for routers with integrated PON)
+        - RTL9602C
+    * RTL9607 series (multi WAN SoC for HGU with integrated PON)
+        - RTL9607C
+        - RTL9607Cv2
+        - RTL9607FS
+        - RTL9607DQ
+    * RTL9615C (XGS-PON)
+    * RTL8290 (laser driver)
 - Cortina Systems/Cortina Access (previously StorLink)
     * Cortina QWCS8032E
     * Cortina CA8289
-- Lantiq:
-   * Falcon series (GPON)
+    * CA8271 series (XGS-PON and 10G-EPON)
+        - CA8271A
+        - CA8271S
+        - CA8271NI
+- Lantiq (then Intel, then MaxLinear):
+   * Falcon series (GPON, End Of Life)
     - PEB98010
     - PEB98035 (HSGMII)
     - PEB98036
-   * PRX series (XGSPON)
+   * PRX series (XGS-PON, MaxLinear)
     - PRX120
     - PRX126
     - PRX321
 - ZTE:
-    * FA626TE 
+    * FA626TE
     * ZX279110a1
     * ZX279125
+    * ZX279127S
+    * ZX279133 (HSGMII)
 - HiSilicon (Huawei)
     * SD5116
-- Marvell 
+    * SD5117 (XGS-PON)
+    * SD5182S (GPON and XGS-PON SFP ONT)
+- Marvell
     * 88F6601
 - Broadcom
     * BCM68 series
+        - BCM6838/BCM68380
+        - BCM6848
+        - BCM68360
+    * BCM63153 (router with integrated PON)
+    * BCM55030 (10G-EPON)
 - MediaTek/EcoNet
     * MT7511
     * MT/EN752 series (EN7520T HSGMII)
@@ -51,6 +73,14 @@ Currently, there are only a few main GPON chipset vendors:
 
 HSGMII chipsets are relatively recent, they became more common starting in 2020, and are used in many ONTs. Realtek offers an official SDK, Luna SDK, which offers very good performance in queue management, unfortunately it is not used by all devices based on these chipsets.
 
+The Realtek xPON ICs (RTL9601, RTL9602, RTL9603, RTL9607 and the RTL8290 laser driver) support GPON, EPON and Active Fiber mode, and are distributed in Europe by [MEV Elektronik](https://shop.mev-elektronik.com/product/xpon-ics/).
+
+Community guides for the RTL960x based sticks and ONTs (OMCI cloning, flash variables, 4-port emulation, firmware and key generators): [Hacking RTL960x](https://github.com/fernandothx/Hacking-RTL960x-your-ISP-Fiber).
+
+::: warning End Of Life
+Realtek announced that the RTL9601C and RTL9601CI will be End Of Life at the end of November 2026, and they will not get a replacement.
+:::
+
 ## Lantiq Chipsets
 
 Unfortunately Lantiq no longer exists as it has been bought out and dismembered by Intel. This purchase was a huge deal as at the time Lantiq was at the forefront of the GPON and xDSL chipset market.
@@ -58,6 +88,10 @@ The GPON part of Lantiq ended up in `/dev/null`, while the XGS-PON sector ended
 
 The last produced batches of these SFPs date back to 2020/2021. All OEMs are currently migrating to Realtek.
 
+::: warning End Of Life
+The Lantiq Falcon GPON chipsets (PEB98010, PEB98035, PEB98036) are End Of Life: the SFPs based on them (Huawei MA5671A, Nokia G-010S-P, FS.com GPON-ONU-34-20BI, CarlitoxxPro/Hilink, ...) are no longer produced and are now hard to find, see the [MikroTik forum](https://forum.mikrotik.com/t/usage-gpon-module-sfp-in-spain/104807?page=17).
+:::
+
 ::: danger Warning
 Playing with ONTs can cause your serial number/PLOAM password to be banned and faults to the optics, ONTs and OLTs. Always pay close attention to the calibration of the laser, under no circumstances should the calibration be changed.
 :::
diff --git a/ont-epon/CIG_XE-99C.md b/ont-epon/CIG_XE-99C.md
new file mode 100644
index 00000000..2ff159c6
--- /dev/null
+++ b/ont-epon/CIG_XE-99C.md
@@ -0,0 +1,36 @@
+---
+title: CIG XE-99C
+has_children: false
+alias: Actiontec XE-99C
+parent: CIG
+---
+
+# Hardware Specifications
+
+|                  |                                       |
+| ---------------- | ------------------------------------- |
+| Vendor/Brand     | CIG                                   |
+| Model            | XE-99C                                |
+| ODM              | CIG                                   |
+| Chipset          |                                       |
+| Flash            |                                       |
+| RAM              |                                       |
+| CPU              |                                       |
+| System           |                                       |
+| 10GBaseT         | Yes (1x 10GE + 1x GE optional)        |
+| Optics           | BOSA on board                         |
+| IP address       |                                       |
+| Web Gui          |                                       |
+| SSH              |                                       |
+| Telnet           |                                       |
+| Serial           |                                       |
+| Form Factor      | ONT                                   |
+
+The XE-99C is the 10G-EPON ONT of the CIG XE-99 series (the SFP+ version is the [CIG XE-99S](/epon/CIG_XE-99S)).
+
+It is compliant with IEEE 802.3av, IEEE 1904.1, DPoE v2.0 and CTC V3.0 EPON standards, and it has a 2-pin power plug (+12 VDC), a power switch and a pin-hole reset button.
+
+# Miscellaneous Links
+
+- [Actiontec Broadband](https://actiontec.com/broadband/)
+- [CIG 10G EPON ONT (DirectIndustry)](https://www.directindustry.com/prod/cambridge-industries-group/product-236815-2398564.html)
diff --git a/ont-epon/ZTE.md b/ont-epon/ZTE.md
new file mode 100644
index 00000000..1ec42f34
--- /dev/null
+++ b/ont-epon/ZTE.md
@@ -0,0 +1,4 @@
+---
+title: ZTE
+has_children: true
+---
diff --git a/ont-epon/ZTE_F401.md b/ont-epon/ZTE_F401.md
new file mode 100644
index 00000000..b626667a
--- /dev/null
+++ b/ont-epon/ZTE_F401.md
@@ -0,0 +1,32 @@
+---
+title: ZTE F401
+has_children: false
+parent: ZTE
+---
+
+# Hardware Specifications
+
+|                 |                                  |
+| --------------- | -------------------------------- |
+| Vendor/Brand    | ZTE                              |
+| Model           | ZXA10 F401 / ZXHN F401           |
+| Chipset         |                                  |
+| Flash           |                                  |
+| RAM             |                                  |
+| System          |                                  |
+| 2.5GBaseT       | No (1x GE)                       |
+| Optics          | SC/APC or SC/UPC (depends on the variant) |
+| IP address      |                                  |
+| Web Gui         |                                  |
+| SSH             |                                  |
+| Telnet          |                                  |
+| Serial          |                                  |
+| Serial baud     |                                  |
+| Serial encoding |                                  |
+| Form Factor     | ONT                              |
+
+The ZTE F401 is a bridge type EPON ONT (1G-EPON, 1.25 Gbps symmetric, IEEE 802.3ah) with one 10/100/1000Base-T Ethernet port.
+
+::: warning
+The F401 is also sold in G/EPON (xPON) variants: check the label and the firmware of the unit before using it on a GPON network. For the GPON ZTE ONT with one GE port see the [ZTE F601](/ont-zte-f601).
+:::
diff --git a/ont-xgs/ont-adtran-sdx-631.md b/ont-xgs/ont-adtran-sdx-631.md
new file mode 100644
index 00000000..fa59c7ff
--- /dev/null
+++ b/ont-xgs/ont-adtran-sdx-631.md
@@ -0,0 +1,48 @@
+---
+title: Adtran SDX 631
+has_children: false
+parent: Adtran
+---
+
+# Hardware Specifications
+
+|                 |                                  |
+| --------------- | -------------------------------- |
+| Vendor/Brand    | Adtran                           |
+| Model           | SDX 631                          |
+| Part Number     | 1287930F1 (North America)        |
+| Chipset         |                                  |
+| Flash           |                                  |
+| RAM             |                                  |
+| System          |                                  |
+| 10GBaseT        | Yes (1x 100M/1G/2.5G/5G/10G)     |
+| Optics          | SC/APC                           |
+| IP address      |                                  |
+| Web Gui         |                                  |
+| SSH             |                                  |
+| Telnet          |                                  |
+| Serial          |                                  |
+| Serial baud     |                                  |
+| Serial encoding |                                  |
+| Form Factor     | ONT                              |
+
+The SDX 631 is the 10GbE indoor ONT of the Adtran SDX 630 series. The 2.5GbE variant is the [SDX 631q](/xgs/ont-adtran-sdx-631q).
+
+## Specifications
+
+From the SDX 630 series datasheet:
+
+|                        |                                                                      |
+| ---------------------- | -------------------------------------------------------------------- |
+| PON                    | XGS-PON (ITU-T G.9807.1), 9.9532 Gbit/s symmetric, up to 1:128 split |
+| Wavelengths            | 1577 nm downstream, 1270 nm upstream                                 |
+| Management             | OMCI (ITU-T G.988), BBF.247, TR-471 speedtest, Y.1731                |
+| Ethernet               | 9k jumbo frames, 802.1ad Q-in-Q, SyncE                               |
+| Operating temperature  | 0 °C ~ +40 °C                                                        |
+| Dimensions (D x W x H) | 114.5 x 133.3 x 35.5 mm                                              |
+| Mounting               | Desk, wall, fiber tray, wall mount box, DIN rail                     |
+
+# Miscellaneous Links
+
+- [Adtran SDX 630 Series](https://www.adtran.com/en/products-and-services/sdx-630-series-for-standard-deployments)
+- [SDX 630 Series datasheet](https://www.adtran.com/-/media/adtran/resources/data-sheets/pdfs/sdx-630-series.pdf)
diff --git a/ont-xgs/ont-adtran-sdx-631q.md b/ont-xgs/ont-adtran-sdx-631q.md
new file mode 100644
index 00000000..6ab927b2
--- /dev/null
+++ b/ont-xgs/ont-adtran-sdx-631q.md
@@ -0,0 +1,46 @@
+---
+title: Adtran SDX 631q
+has_children: false
+parent: Adtran
+---
+
+# Hardware Specifications
+
+|                 |                                  |
+| --------------- | -------------------------------- |
+| Vendor/Brand    | Adtran                           |
+| Model           | SDX 631q                         |
+| Chipset         |                                  |
+| Flash           |                                  |
+| RAM             |                                  |
+| System          |                                  |
+| 2.5GBaseT       | Yes (1x 10M/100M/1G/2.5G)        |
+| Optics          | SC/APC                           |
+| IP address      |                                  |
+| Web Gui         |                                  |
+| SSH             |                                  |
+| Telnet          |                                  |
+| Serial          |                                  |
+| Serial baud     |                                  |
+| Serial encoding |                                  |
+| Form Factor     | ONT                              |
+
+The SDX 631q is the 2.5GbE indoor ONT of the Adtran SDX 630 series. The 10GbE variant is the [SDX 631](/xgs/ont-adtran-sdx-631), the variant with one FXS port is the SDX 631qv.
+
+## Specifications
+
+From the SDX 630 series datasheet:
+
+|                        |                                                                      |
+| ---------------------- | -------------------------------------------------------------------- |
+| PON                    | XGS-PON (ITU-T G.9807.1), 9.9532 Gbit/s symmetric, up to 1:128 split |
+| Wavelengths            | 1577 nm downstream, 1270 nm upstream                                 |
+| Management             | OMCI (ITU-T G.988), BBF.247, TR-471 speedtest, Y.1731                |
+| Operating temperature  | 0 °C ~ +40 °C                                                        |
+| Dimensions (D x W x H) | 114.5 x 133.3 x 35.5 mm                                              |
+| Mounting               | Desk, wall, fiber tray, wall mount box, DIN rail                     |
+
+# Miscellaneous Links
+
+- [Adtran SDX 630 Series](https://www.adtran.com/en/products-and-services/sdx-630-series-for-standard-deployments)
+- [SDX 630 Series datasheet](https://www.adtran.com/-/media/adtran/resources/data-sheets/pdfs/sdx-630-series.pdf)
diff --git a/ont-xgs/ont-cig-XG-99C.md b/ont-xgs/ont-cig-XG-99C.md
new file mode 100644
index 00000000..901d33ec
--- /dev/null
+++ b/ont-xgs/ont-cig-XG-99C.md
@@ -0,0 +1,57 @@
+---
+title: CIG XG-99C
+has_children: false
+alias: Actiontec XG-99C
+parent: CIG
+---
+
+# Hardware Specifications
+
+|                 |                                                |
+| --------------- | ---------------------------------------------- |
+| Vendor/Brand    | CIG                                            |
+| Model           | XG-99C (XG-99C1, XG-99C2)                      |
+| ODM             | CIG                                            |
+| Chipset         |                                                |
+| Flash           |                                                |
+| RAM             |                                                |
+| System          |                                                |
+| 10GBaseT        | Yes (1x 10GBase-T, compatible with 5G/2.5G/1G) |
+| Optics          |                                                |
+| IP address      |                                                |
+| Web Gui         |                                                |
+| SSH             |                                                |
+| Telnet          |                                                |
+| Serial          |                                                |
+| Serial baud     |                                                |
+| Serial encoding |                                                |
+| Form Factor     | ONT                                            |
+
+The XG-99C is the XGS-PON SFU ONT of the CIG XG-99 series (the SFP+ version is the [CIG XG-99S](/xgs/ont-cig-XG-99S)).
+
+| Product | 10GBase-T | 10/100/1000Base-T |
+| ------- | --------- | ----------------- |
+| XG-99C1 | 1         | 1                 |
+| XG-99C2 | 1         | 0                 |
+
+## Specifications
+
+From the Actiontec datasheet (version 2.0, Nov 2023):
+
+|                        |                                                                        |
+| ---------------------- | ---------------------------------------------------------------------- |
+| PON                    | XGS-PON (ITU-T G.9807.1), Class N1, on-board optics                    |
+| Wavelengths            | US 1260 ~ 1280 nm, DS 1575 ~ 1580 nm                                   |
+| Launch power           | +4 ~ +9 dBm                                                            |
+| Sensitivity            | -28 dBm                                                                |
+| Overload               | -9 dBm                                                                 |
+| Management             | OMCI (ITU-T G.988), dual image with integrity check and rollback       |
+| Power supply           | +12 V (external AC/DC adapter), dying gasp, power switch               |
+| Power consumption      | < 10 W                                                                 |
+| Operating temperature  | -5 °C ~ 45 °C                                                          |
+| Dimensions (H x W x D) | 150 x 110 x 30 mm (without bracket), 215 x 110 x 40 mm (with bracket)  |
+
+# Miscellaneous Links
+
+- [XG-99C Datasheet (Actiontec)](https://newserv.actiontec.com/wp-content/uploads/2024/10/AEI-XG-99C_DataSheet_V2.pdf)
+- [DSLReports: AT&T Fiber XGS-PON SFP modules](https://www.dslreports.com/forum/r33665048-AT-T-Fiber-XGS-PON-SFP-Modules-for-AT-T-Fiber)
diff --git a/ont-xgs/ont-fs-XGS-ONU-25-20NI.md b/ont-xgs/ont-fs-XGS-ONU-25-20NI.md
index 94c2bd2c..fcfa10c2 100644
--- a/ont-xgs/ont-fs-XGS-ONU-25-20NI.md
+++ b/ont-xgs/ont-fs-XGS-ONU-25-20NI.md
@@ -1,6 +1,7 @@
 ---
 title: FS.com Generic Compatible XGSPON Stick ONU with MAC SFP+ (XGS-ONU-25-20NI)
 has_children: true
+alias: E.C.I. Networks EN-XGSFPP-OMAC v1
 parent: FS.com
 ---
 
diff --git a/ont-xgs/ont-genexis-ft-xgs2110-2.5g.md b/ont-xgs/ont-genexis-ft-xgs2110-2.5g.md
new file mode 100644
index 00000000..d8a9b9d8
--- /dev/null
+++ b/ont-xgs/ont-genexis-ft-xgs2110-2.5g.md
@@ -0,0 +1,49 @@
+---
+title: Genexis FiberTwist XGS2110-2.5G
+has_children: false
+parent: Genexis
+---
+
+# Hardware Specifications
+
+|                 |                                 |
+| --------------- | ------------------------------- |
+| Vendor/Brand    | Genexis                         |
+| Model           | FiberTwist XGS2110-2.5G         |
+| Chipset         |                                 |
+| Flash           |                                 |
+| RAM             |                                 |
+| System          |                                 |
+| 2.5GBaseT       | Yes (1x 100/1000/2.5G BASE-T)   |
+| Optics          | SC/APC                          |
+| IP address      |                                 |
+| Web Gui         |                                 |
+| SSH             |                                 |
+| Telnet          |                                 |
+| Serial          |                                 |
+| Serial baud     |                                 |
+| Serial encoding |                                 |
+| Form Factor     | ONT                             |
+
+The FiberTwist XGS2110-2.5G is a Layer-2 XGS-PON ONT with one 2.5GE LAN port. Like the GPON [FiberTwist G2110C-2.5G](/ont-genexis-ft-g2110c-2.5g), it is installed by twisting it on the Genexis fiber termination unit (FTU) or bracket. The 10GE variant is the [FiberTwist XGS2110](/xgs/ont-genexis-ft-xgs2110).
+
+## Specifications
+
+From the FiberTwist XGS2000-Series datasheet (rev. 3.9):
+
+|                        |                                                                        |
+| ---------------------- | ---------------------------------------------------------------------- |
+| PON                    | XGS-PON (ITU-T G.9807.1 Annex B), ITU-T G.988, BBF TR-156, TR-247      |
+| Optics                 | N1, TX +4 ~ +9 dBm, RX -9 ~ -28 dBm                                    |
+| Wavelengths            | TX 1260 ~ 1280 nm, RX 1575 ~ 1580 nm                                   |
+| PON features           | TrueTalk PON autosensing, up to 256 XGEM ports, 32 T-CONTs, dying gasp |
+| Power supply           | 12 Vdc ± 5%                                                            |
+| Power consumption      | 3.2 W (EU-CoC-BBE)                                                     |
+| Operating temperature  | 0 ~ 40 °C                                                              |
+| Dimensions (H x W x D) | 110 x 110 x 46 mm                                                      |
+| Weight                 | 158 g                                                                  |
+
+# Miscellaneous Links
+
+- [Genexis FiberTwist XGS2110-2.5G](https://genexis.eu/product/fibertwist-xgs2110-2-5g/)
+- [FiberTwist XGS2000-Series datasheet](https://genexis.eu/wp-content/uploads/2024/09/FiberTwist-XGS2000-Series-XGS-PON-Datasheet-v3.9-EN.pdf)
diff --git a/ont-xgs/ont-genexis-ft-xgs2110.md b/ont-xgs/ont-genexis-ft-xgs2110.md
new file mode 100644
index 00000000..466d261d
--- /dev/null
+++ b/ont-xgs/ont-genexis-ft-xgs2110.md
@@ -0,0 +1,49 @@
+---
+title: Genexis FiberTwist XGS2110
+has_children: false
+parent: Genexis
+---
+
+# Hardware Specifications
+
+|                 |                                       |
+| --------------- | ------------------------------------- |
+| Vendor/Brand    | Genexis                               |
+| Model           | FiberTwist XGS2110                    |
+| Chipset         |                                       |
+| Flash           |                                       |
+| RAM             |                                       |
+| System          |                                       |
+| 10GBaseT        | Yes (1x 100/1000/2.5G/5G/10G BASE-T)  |
+| Optics          | SC/APC                                |
+| IP address      |                                       |
+| Web Gui         |                                       |
+| SSH             |                                       |
+| Telnet          |                                       |
+| Serial          |                                       |
+| Serial baud     |                                       |
+| Serial encoding |                                       |
+| Form Factor     | ONT                                   |
+
+The FiberTwist XGS2110 is a Layer-2 XGS-PON ONT with one 10GE LAN port. Like the GPON [FiberTwist G2110C](/ont-genexis-ft-g2110c), it is installed by twisting it on the Genexis fiber termination unit (FTU) or bracket. The 2.5GE variant is the [FiberTwist XGS2110-2.5G](/xgs/ont-genexis-ft-xgs2110-2.5g).
+
+## Specifications
+
+From the FiberTwist XGS2000-Series datasheet (rev. 3.9):
+
+|                        |                                                                        |
+| ---------------------- | ---------------------------------------------------------------------- |
+| PON                    | XGS-PON (ITU-T G.9807.1 Annex B), ITU-T G.988, BBF TR-156, TR-247      |
+| Optics                 | N1, TX +4 ~ +9 dBm, RX -9 ~ -28 dBm                                    |
+| Wavelengths            | TX 1260 ~ 1280 nm, RX 1575 ~ 1580 nm                                   |
+| PON features           | TrueTalk PON autosensing, up to 256 XGEM ports, 32 T-CONTs, dying gasp |
+| Power supply           | 12 Vdc ± 5%                                                            |
+| Power consumption      | 4.9 W (EU-CoC-BBE)                                                     |
+| Operating temperature  | 0 ~ 40 °C                                                              |
+| Dimensions (H x W x D) | 110 x 110 x 46 mm                                                      |
+| Weight                 | 187 g                                                                  |
+
+# Miscellaneous Links
+
+- [FiberTwist XGS2000-Series datasheet](https://genexis.eu/wp-content/uploads/2024/09/FiberTwist-XGS2000-Series-XGS-PON-Datasheet-v3.9-EN.pdf)
+- [Genexis 2nd generation FiberTwist XGS-PON ONT portfolio](https://genexis.eu/news-item/genexis-launches-2nd-gen-fibertwist-xgs-pon-ont-portfolio/)
diff --git a/ont-xgs/ont-genexis.md b/ont-xgs/ont-genexis.md
new file mode 100644
index 00000000..3adab49d
--- /dev/null
+++ b/ont-xgs/ont-genexis.md
@@ -0,0 +1,4 @@
+---
+title: Genexis
+has_children: true
+---
diff --git a/ont-xgs/ont-huawei-optixstar-s800e.md b/ont-xgs/ont-huawei-optixstar-s800e.md
new file mode 100644
index 00000000..71393c8d
--- /dev/null
+++ b/ont-xgs/ont-huawei-optixstar-s800e.md
@@ -0,0 +1,70 @@
+---
+title: Huawei OptiXstar S800E
+has_children: false
+alias: Huawei OptiXstar S800E-M
+parent: Huawei
+---
+
+# Hardware Specifications
+
+|                 |                                         |
+| --------------- | --------------------------------------- |
+| Vendor/Brand    | Huawei                                  |
+| Model           | OptiXstar S800E                         |
+| Chipset         | HiSilicon SD5182S                       |
+| BOSA            | HN517X (XGS-PON)                        |
+| Flash           |                                         |
+| RAM             |                                         |
+| System          |                                         |
+| Host interface  | GE/2.5GE/5GE/10GE adaptive (per Huawei) |
+| Optics          | SC/APC                                  |
+| IP address      |                                         |
+| Web Gui         |                                         |
+| SSH             |                                         |
+| Telnet          |                                         |
+| Serial          |                                         |
+| Form Factor     | miniONT SFP+                            |
+
+The OptiXstar S800E is an XGS-PON SFP+ ONU designed by Huawei to be plugged into the SFP+ port of cameras, access points or routers. The GPON version is the [OptiXstar S600E / MA5671B](/ont-huawei-optixstar-s600e): the two sticks share the same SoC (HiSilicon SD5182S) and differ only in the BOSA.
+
+## Board configuration
+
+```
+# S800E-M S800E
+board_id=2014; pcb_id=0; soc_type=SD5182S; slic_type=NONE; ext_phy_type=NONE; bob_type=HN517X; xml_path=S800E_SD5182S/; usb=N; sd=N; rf=N; battery=N; iot=N; nfc=N; lte=N; pse_type=NONE; rs485=Y; sfp_onu=Y;
+```
+
+## Optical and electrical specifications
+
+From the Huawei product page and datasheet (2020-06-01):
+
+|                           |                                                        |
+| ------------------------- | ------------------------------------------------------ |
+| NNI                       | XGS-PON, SC/APC                                        |
+| UNI                       | GE/2.5GE/5GE/10GE interface adaptive                   |
+| Standard                  | ITU-T G.9807                                           |
+| Maximum distance          | 20 km                                                  |
+| TX wavelength             | 1260 ~ 1280 nm (center 1270 nm)                        |
+| RX wavelength             | 1575 ~ 1580 nm (center 1577 nm)                        |
+| Rate                      | TX 9.953 Gbit/s, RX 9.953 Gbit/s                       |
+| TX power                  | 4 ~ 9 dBm                                              |
+| Extinction ratio          | ≥ 6 dB                                                 |
+| Receiver sensitivity      | ≤ -28 dBm                                              |
+| Overload                  | ≥ -9 dBm                                               |
+| Power supply              | 3.3 V                                                  |
+| Maximum power consumption | 2 W                                                    |
+| Operating temperature     | -40 °C ~ +85 °C (shell temperature)                    |
+| Operating humidity        | 5% ~ 95% RH (non-condensing)                           |
+| Dimensions                | 65 mm x 13.6 mm x 12.6 mm                              |
+| Weight                    | about 27 g (product page), about 20 g (2020 datasheet) |
+| Other                     | Type B dual-homing (50 ms switching), secure boot      |
+
+Supported functions: variable-length OMCI messages, rogue ONT detection and isolation, PPPoE/DHCP simulation testing, dual-system software backup and rollback, 802.1ag Ethernet OAM, optical link measurement, IGMP v2/v3 and MLD v1/v2 snooping with fast leave, 802.1p priority and SP/WRR scheduling, MAC address filtering.
+
+# Miscellaneous Links
+
+- [Huawei OptiXstar S800E](https://e.huawei.com/it/products/optical-terminal/optixstar-s800e)
+- [Huawei OptiXstar S800E Datasheet (PONPlanet)](https://www.ponplanet.eu/user/related_files/huawei_optixstar_s800e_datasheet_01_en-draft.pdf)
+- [PONPlanet: Huawei OptiXstar S800E](https://www.ponplanet.eu/optixstar-s800e/)
+- [Huawei OptiXstar S800E support](https://support.huawei.com/enterprise/en/optical-access/optixstar-s800e-pid-250646194)
+- [Huawei OptiXstar S600E / MA5671B](/ont-huawei-optixstar-s600e)
diff --git a/ont-xgs/ont-nokia-xs-010g-q.md b/ont-xgs/ont-nokia-xs-010g-q.md
new file mode 100644
index 00000000..dc3ff8b3
--- /dev/null
+++ b/ont-xgs/ont-nokia-xs-010g-q.md
@@ -0,0 +1,53 @@
+---
+title: Nokia XS-010G-Q
+has_children: false
+parent: Nokia
+---
+
+# Hardware Specifications
+
+|                 |                                         |
+| --------------- | --------------------------------------- |
+| Vendor/Brand    | Nokia                                   |
+| Model           | XS-010G-Q                               |
+| Part Number     | 3FE49533AA                              |
+| Chipset         |                                         |
+| Flash           |                                         |
+| RAM             |                                         |
+| System          |                                         |
+| 2.5GBaseT       | Yes (1x 100M/1G/2.5G BASE-T)            |
+| Optics          | SC/APC                                  |
+| IP address      |                                         |
+| Web Gui         | ✅                                      |
+| SSH             |                                         |
+| Telnet          |                                         |
+| Serial          |                                         |
+| Serial baud     |                                         |
+| Serial encoding |                                         |
+| Form Factor     | ONT                                     |
+
+The XS-010G-Q is the XGS-PON SFU ONT of Nokia with one 1/2.5GbE port. The 10GbE variant is the [Nokia XS-010X-Q](/xgs/ont-nokia-xs-010x-q).
+
+## Specifications
+
+From the Nokia datasheet:
+
+|                       |                                                                     |
+| --------------------- | ------------------------------------------------------------------- |
+| PON                   | XGS-PON (ITU-T G.9807.1), 10 Gb/s symmetric, OMCI (ITU-T G.988)     |
+| Wavelengths           | 1260 ~ 1280 nm upstream, 1575 ~ 1580 nm downstream                  |
+| Launch power          | 4 ~ 9 dBm                                                           |
+| Receiving             | -28 ~ -9 dBm                                                        |
+| PON features          | AES 128, FEC, activation with automatic discovered SN and password  |
+| Power supply          | 12 VDC / 1 A                                                        |
+| Power consumption     | < 4.4 W                                                             |
+| Operating temperature | -5 °C ~ 45 °C                                                       |
+| Dimensions (H x W x L)| 3.0 x 13.5 x 13.5 cm                                                |
+| Weight                | 0.366 kg                                                            |
+| LEDs                  | Power, PON, Alarm, Data                                             |
+
+# Miscellaneous Links
+
+- [Nokia ONT XS-010G-Q datasheet](https://onestore.nokia.com/asset/210271)
+- [Nokia ONT XS-010G-Q Quick Reference Guide](https://www.nokia.com/asset/214937/)
+- [ISPreview forum: Nokia XS-010G-Q ONT](https://www.ispreview.co.uk/talk/threads/nokia-xs-010g-q-ont.39655/)
diff --git a/ont-xgs/ont-nokia-xs-010x-q.md b/ont-xgs/ont-nokia-xs-010x-q.md
index 068bfab8..28f8743c 100644
--- a/ont-xgs/ont-nokia-xs-010x-q.md
+++ b/ont-xgs/ont-nokia-xs-010x-q.md
@@ -120,3 +120,7 @@ normal load eep datat
 ```
 
 Now reboot the ONT and you can access telnet with `ONTUSER` and full power :)
+
+# Miscellaneous Links
+
+- [pon.wiki: Nokia XS-010X-Q](https://pon.wiki/xgs-pon/ont/nokia/xs-010x-q/)
diff --git a/ont-xgs/ont-ufiber-uisp-fiber-xgs.md b/ont-xgs/ont-ufiber-uisp-fiber-xgs.md
new file mode 100644
index 00000000..57c68f7e
--- /dev/null
+++ b/ont-xgs/ont-ufiber-uisp-fiber-xgs.md
@@ -0,0 +1,36 @@
+---
+title: UISP Fiber XGS
+has_children: false
+parent: UFiber
+---
+
+# Hardware Specifications
+
+|                 |                                  |
+| --------------- | -------------------------------- |
+| Vendor/Brand    | Ubiquiti                         |
+| Model           | UISP Fiber XGS (UISP-FIBER-XGS)  |
+| Chipset         |                                  |
+| Flash           |                                  |
+| RAM             |                                  |
+| System          |                                  |
+| 10GBaseT        | Yes (1x 10GbE RJ45)              |
+| Optics          | SC/APC                           |
+| IP address      |                                  |
+| Web Gui         |                                  |
+| SSH             |                                  |
+| Telnet          |                                  |
+| Serial          |                                  |
+| Serial baud     |                                  |
+| Serial encoding |                                  |
+| Form Factor     | ONT                              |
+
+The UISP Fiber XGS is the XGS-PON ONU of the Ubiquiti UISP Fiber line, with one XGS-PON port and one 10GbE RJ45 LAN port, supporting bridge and router mode. It is managed with the UISP application.
+
+::: warning
+According to Ubiquiti, the ONU works only with the UISP Fiber XGS OLT and cannot be used with third-party OLTs.
+:::
+
+# Miscellaneous Links
+
+- [Ubiquiti Store](https://store.ui.com/)
diff --git a/ont-xgs/ont-ufiber.md b/ont-xgs/ont-ufiber.md
new file mode 100644
index 00000000..cadf6aac
--- /dev/null
+++ b/ont-xgs/ont-ufiber.md
@@ -0,0 +1,4 @@
+---
+title: UFiber
+has_children: true
+---
diff --git a/ont/ont-avm-g-95sp.md b/ont/ont-avm-g-95sp.md
new file mode 100644
index 00000000..537c46a0
--- /dev/null
+++ b/ont/ont-avm-g-95sp.md
@@ -0,0 +1,75 @@
+---
+title: AVM GmbH (G-95SP)
+has_children: false
+parent: AVM
+---
+
+# Hardware Specifications
+
+|                  |                                                  |
+| ---------------- | ------------------------------------------------ |
+| Vendor/Brand     | AVM GmbH                                         |
+| Model            | G-95SP                                           |
+| ODM              | CIG                                              |
+| ODM Product Code | G-95SP                                           |
+| Chipset          | Lantiq PEB98035                                  |
+| CPU              |                                                  |
+| CPU Clock        |                                                  |
+| Flash            |                                                  |
+| RAM              |                                                  |
+| System           | Linux (kernel 3.10.4, AVM firmware `SFP_7.5.13`) |
+| HSGMII           | No (SGMII / 1000Base-X)                          |
+| Optics           | SC/APC                                           |
+| IP address       | 192.168.47.1                                     |
+| Web Gui          | No                                               |
+| SSH              | No                                               |
+| Telnet           | No                                               |
+| Serial           |                                                  |
+| Form Factor      | miniONT SFP                                      |
+
+<ImageFigure file="AVM_G-95SP/module.png" alt="AVM GmbH (G-95SP)" caption="AVM GmbH (G-95SP) label (from the tomazzaman video)" />
+
+The AVM GmbH (G-95SP) is the [CIG G-95SP](/ont-cig-g-95sp) with an AVM firmware, shipped together with some FRITZ!Box models with an SFP cage (e.g. FRITZ!Box 5491). For the optical and electrical specifications and the pinout see the [CIG G-95SP](/ont-cig-g-95sp) page.
+
+The firmware image of the stick (`SFP_7.5.13`, MIPS uImage with Linux 3.10.4 and a SquashFS root filesystem) is contained in the FRITZ!Box firmware.
+
+# AVM configuration protocol
+
+The stick does not store the GPON serial number: when the FRITZ!Box detects the SFP it opens a TCP connection to the stick on `192.168.47.1:8888` (the FRITZ!Box uses `192.168.47.2`) and pushes the configuration with a binary protocol. The stick does not listen on other ports.
+
+The protocol is not documented. A capture taken from a FRITZ!Box 5491 (see the videos linked below) contains the following messages, each one starting with the `AVM` magic:
+
+```
+41564d00000007000400000001
+41564d000000030000
+41564d000200120000
+41564d0604000b000400000001
+41564d060600080000
+41564d00080009000a4621426f783534393100
+41564d000a0010000d30372e31325f312e332e323600
+41564d000c000c0000
+41564d000e000a000a20202020202020202020
+41564d00100013000c41564d473632373233383341
+41564d0012000d0000
+41564d001400140000
+```
+
+Some of the payloads are readable strings:
+
+- `F!Box5491` (shortened product name of the FRITZ!Box 5491)
+- `07.12_1.3.26` (probably a firmware version)
+- 10 spaces (probably the PLOAM password)
+- `AVMG6272383A` (the GPON serial number)
+
+Replaying the captured frames (e.g. with `tcpreplay`) brings the stick online with other hardware.
+
+::: info Note
+The capture and its decoding come from [issue #46](https://github.com/hack-gpon/hack-gpon.github.io/issues/46). If you have a G-95SP and a FRITZ!Box, captures from other models or ISPs are welcome.
+:::
+
+# Miscellaneous Links
+
+- [CIG G-95SP](/ont-cig-g-95sp)
+- [OpenWrt Forum](https://forum.openwrt.org/t/cigtech-g-95sp-sfp-gpon/63352)
+- [Video: FRITZ!Box SFP capture (tomazzaman)](https://www.youtube.com/watch?v=Hi7JMTojT-4&t=6m20s)
+- [Video: FRITZ!Box SFP configuration (tomazzaman)](https://www.youtube.com/watch?v=7RZ6JtjHBfo&t=11m11s)
diff --git a/ont/ont-avm.md b/ont/ont-avm.md
new file mode 100644
index 00000000..7d0a9776
--- /dev/null
+++ b/ont/ont-avm.md
@@ -0,0 +1,4 @@
+---
+title: AVM
+has_children: true
+---
diff --git a/ont/ont-cig-g-95sp.md b/ont/ont-cig-g-95sp.md
new file mode 100644
index 00000000..3cdc1f45
--- /dev/null
+++ b/ont/ont-cig-g-95sp.md
@@ -0,0 +1,80 @@
+---
+title: CIG G-95SP
+has_children: false
+parent: CIG
+---
+
+# Hardware Specifications
+
+|                  |                                                          |
+| ---------------- | -------------------------------------------------------- |
+| Vendor/Brand     | CIG                                                      |
+| Model            | G-95SP                                                   |
+| ODM              | ✅                                                       |
+| Chipset          | Lantiq PEB98035                                          |
+| CPU              |                                                          |
+| CPU Clock        |                                                          |
+| Flash            |                                                          |
+| RAM              |                                                          |
+| System           |                                                          |
+| HSGMII           | No (SGMII / 1000Base-X)                                  |
+| Optics           | SC/APC                                                   |
+| IP address       |                                                          |
+| Web Gui          |                                                          |
+| SSH              |                                                          |
+| Telnet           |                                                          |
+| Serial           |                                                          |
+| Form Factor      | miniONT SFP                                              |
+
+The G-95SP is the older CIG GPON SFP stick, based on a Lantiq board (the newer [CIG G-97SP](/ont-cig-g-97sp) uses a Realtek board).
+
+It is also sold by AVM with a custom firmware, see [AVM GmbH (G-95SP)](/ont-avm-g-95sp).
+
+## Optical and electrical specifications
+
+From the CIG platform briefing (version 2, Jan 2018):
+
+|                   |                                                            |
+| ----------------- | ---------------------------------------------------------- |
+| Standard          | ITU-T G.984, G.984.2 Amd1 Class B+ (Class C/C+ optional)   |
+| Wavelengths       | US 1310 nm, DS 1490 nm                                     |
+| Upstream          | 1.244 Gbps burst mode, DFB transmitter                     |
+| Downstream        | 2.488 Gbps, APD receiver                                   |
+| Launch power      | 0.5 ~ +5 dBm                                               |
+| Sensitivity       | -27 dBm                                                    |
+| Overload          | -8 dBm                                                     |
+| Power consumption | < 2.5 W                                                    |
+| Case temperature  | -40 ~ +85 °C                                               |
+| Dimensions        | 82 mm x 14 mm x 12.5 mm (L x W x D)                        |
+| Management        | OMCI (ITU-T G.984.4 and G.988), dual image with rollback   |
+
+## Module pinout
+
+| PIN | Name                 |
+| --- | -------------------- |
+| 1   | VEET/BOOT4           |
+| 2   | TX_FAULT/ASC_TX/TOD  |
+| 3   | TX_DISABLE           |
+| 4   | SDA                  |
+| 5   | SCL                  |
+| 6   | MOD_ABS              |
+| 7   | Rate SEL/Dyinggasp   |
+| 8   | RX_LOS               |
+| 9   | VEET/1PPS            |
+| 10  | VEET/BOOT0           |
+| 11  | VEER                 |
+| 12  | RD-                  |
+| 13  | RD+                  |
+| 14  | VEER                 |
+| 15  | VCCR                 |
+| 16  | VCCT                 |
+| 17  | VEET                 |
+| 18  | TD+                  |
+| 19  | TD-                  |
+| 20  | VEET                 |
+
+# Miscellaneous Links
+
+- [GPON ONT G-95SP Platform Briefing (archive.org)](https://web.archive.org/web/20221022023845/https://www.cigtech.com/wp-content/uploads/2018/03/G-95SP_DataSheet_V2.pdf)
+- [Tech Info Depot Wiki](http://en.techinfodepot.shoutwiki.com/wiki/Cigtech_G-95SP)
+- [AVM GmbH (G-95SP)](/ont-avm-g-95sp)
diff --git a/ont/ont-cig-g-97sp.md b/ont/ont-cig-g-97sp.md
index 39af1850..2690c20b 100644
--- a/ont/ont-cig-g-97sp.md
+++ b/ont/ont-cig-g-97sp.md
@@ -11,7 +11,7 @@ parent: CIG
 | Vendor/Brand     | CIG             |
 | Model            | G-97SP          |
 | ODM              | ✅              |
-| Chipset          | Lantiq PEB98035 |
+| Chipset          | Realtek         |
 | CPU              |                 |
 | CPU Clock        |                 |
 | Flash            |                 |
@@ -25,8 +25,8 @@ parent: CIG
 | Serial           |                 |
 | Form Factor      | miniONT SFP     |
 
+The G-97SP is the newer CIG GPON SFP stick, based on a Realtek board. The older Lantiq based model is the [CIG G-95SP](/ont-cig-g-95sp).
+
 # Miscellaneous Links
 
-- [GPON ONT G-95SP Platform Briefing](https://www.cigtech.com/wp-content/uploads/2018/03/G-95SP_DataSheet_V2.pdf)
-- [Tech Info Depot Wiki](http://en.techinfodepot.shoutwiki.com/wiki/Cigtech_G-95SP)
-- [OpenWrt Forum](https://forum.openwrt.org/t/cigtech-g-95sp-sfp-gpon/63352)
+- [CIG G-95SP](/ont-cig-g-95sp)
diff --git a/ont/ont-fs-com-gpon-onu-stick-with-mac.md b/ont/ont-fs-com-gpon-onu-stick-with-mac.md
index 243ec894..d4b3ee5f 100644
--- a/ont/ont-fs-com-gpon-onu-stick-with-mac.md
+++ b/ont/ont-fs-com-gpon-onu-stick-with-mac.md
@@ -566,6 +566,7 @@ For more information, see the SFF-8472 Rev 11.0 specification.
 - [SourcePhotonics SPS-34-24T-HP-TDFO Datasheet](https://www.sourcephotonics.com/wp-content/uploads/2017/08/DS-8085-02_SPS-34-24T-HP-TDFO.pdf)
 - [FS.com GPON-SFP-ONT-MAC-I SKU 133619 Datasheet](https://resource.fs.com/mall/resource/gpon-sfp-ont-mac-i-datasheet.pdf)
 - [FS.com GPON-ONU-34-20BI Configuration Guide](https://resource.fs.com/mall/doc/20230831180515egrzs6.pdf)
+- [pon.wiki: Source Photonics SPS-34-24T-HP-TDFO](https://pon.wiki/gpon/ont/source-photonics/sps-34-24t-hp-tdfo/)
 
 ---
 
diff --git a/ont/ont-huawei-hg8310m.md b/ont/ont-huawei-hg8310m.md
new file mode 100644
index 00000000..98c66f13
--- /dev/null
+++ b/ont/ont-huawei-hg8310m.md
@@ -0,0 +1,48 @@
+---
+title: Huawei HG8310M
+has_children: false
+parent: Huawei
+---
+
+# Hardware Specifications
+
+|                 |                                  |
+| --------------- | -------------------------------- |
+| Vendor/Brand    | Huawei                           |
+| Model           | EchoLife HG8310M                 |
+| Chipset         |                                  |
+| Flash           |                                  |
+| RAM             |                                  |
+| System          |                                  |
+| 2.5GBaseT       | No (1x GE)                       |
+| Optics          | SC/UPC                           |
+| IP address      |                                  |
+| Web Gui         | ✅                               |
+| SSH             |                                  |
+| Telnet          |                                  |
+| Serial          |                                  |
+| Serial baud     |                                  |
+| Serial encoding |                                  |
+| Form Factor     | ONT                              |
+
+The EchoLife HG8310M is a bridge type GPON ONT with one GE port. Some resellers sell it as an XPON (GPON/EPON) ONT, but the datasheet only lists GPON.
+
+## Specifications
+
+From the datasheet:
+
+|                           |                                                                              |
+| ------------------------- | ---------------------------------------------------------------------------- |
+| GPON port                 | Class B+, receiver sensitivity -27 dBm, wavelengths US 1310 nm, DS 1490 nm   |
+| Authentication            | SN or password (ITU-T G.984.3)                                               |
+| Management                | OMCI, Web UI, dual-system software backup and rollback                       |
+| Dimensions (H x W x D)    | 115 x 94 x 27 mm (V300R015C00 and earlier), 82 x 90 x 27 mm (V300R015C10)    |
+| Weight                    | < 500 g                                                                      |
+| Operating temperature     | 0 °C ~ +40 °C                                                                |
+| Static power consumption  | 3 W (V300R015C00), 2 W (V300R015C10)                                         |
+| Maximum power consumption | 3.5 W (V300R015C00), 2.5 W (V300R015C10)                                     |
+| Indicators                | POWER/PON/LOS/LAN                                                            |
+
+# Miscellaneous Links
+
+- [EchoLife HG8310M Datasheet (hi-network.com)](https://www.hi-network.com/action/download?file=huawei-echolife-hg8310m-brochure-datasheet)
diff --git a/ont/ont-huawei-ma5671a.md b/ont/ont-huawei-ma5671a.md
index 7605af61..2db63198 100644
--- a/ont/ont-huawei-ma5671a.md
+++ b/ont/ont-huawei-ma5671a.md
@@ -406,6 +406,7 @@ For more information, see the SFF-8472 Rev 10.2 specification.
 
 # Miscellaneous Links
 
+- [Huawei MA5671B / OptiXstar S600E (successor)](/ont-huawei-optixstar-s600e)
 - [Support MA5671A SFP GPON - OpenWRT forum](https://forum.openwrt.org/t/support-ma5671a-sfp-gpon/48042)
 - [u boot lantiq falcon - GitHub](https://github.com/minhng99/u-boot_lantiq_falcon)
 - [Custom Firmware - right.com.cn](https://www.right.com.cn/forum/thread-8220173-1-1.html)
diff --git a/ont/ont-huawei-optixstar-s600e.md b/ont/ont-huawei-optixstar-s600e.md
new file mode 100644
index 00000000..86c8dd72
--- /dev/null
+++ b/ont/ont-huawei-optixstar-s600e.md
@@ -0,0 +1,70 @@
+---
+title: Huawei OptiXstar S600E
+has_children: false
+alias: Huawei MA5671B
+parent: Huawei
+---
+
+# Hardware Specifications
+
+|                  |                                         |
+| ---------------- | --------------------------------------- |
+| Vendor/Brand     | Huawei                                  |
+| Model            | OptiXstar S600E                         |
+| Chipset          | HiSilicon SD5182S                       |
+| BOSA             | UX5176 (GPON)                           |
+| Flash            |                                         |
+| RAM              |                                         |
+| System           |                                         |
+| HSGMII           |                                         |
+| Host interface   | GE/2.5GE/5GE/10GE adaptive (per Huawei) |
+| Optics           | SC/APC                                  |
+| IP address       |                                         |
+| Web Gui          |                                         |
+| SSH              |                                         |
+| Telnet           |                                         |
+| Serial           |                                         |
+| Form Factor      | miniONT SFP                             |
+
+The OptiXstar S600E is a GPON SFP ONU designed by Huawei to be plugged into the SFP port of cameras and access points for video or wireless backhaul.
+
+It is also sold as MA5671B, the successor of the [Huawei MA5671A](/ont-huawei-ma5671a). The XGS-PON version is the [OptiXstar S800E](/xgs/ont-huawei-optixstar-s800e): the two sticks share the same SoC (HiSilicon SD5182S) and differ only in the BOSA.
+
+## Board configuration
+
+```
+# MA5671B T600
+board_id=2001; pcb_id=0; soc_type=SD5182S; slic_type=NONE; ext_phy_type=NONE; bob_type=UX5176; xml_path=S600E_SD5182S/; usb=N; sd=N; rf=N; battery=N; iot=N; nfc=N; lte=N; pse_type=NONE; rs485=Y;
+```
+
+## Optical and electrical specifications
+
+From the Huawei product page and datasheet:
+
+|                           |                                                       |
+| ------------------------- | ----------------------------------------------------- |
+| NNI                       | GPON, SC/APC                                          |
+| UNI                       | GE/2.5GE/5GE/10GE interface adaptive                  |
+| Standard                  | ITU-T G.984.2, Class B+                               |
+| TX wavelength             | 1290 ~ 1330 nm (center 1310 nm)                       |
+| RX wavelength             | 1480 ~ 1500 nm (center 1490 nm)                       |
+| Rate                      | TX 1.244 Gbit/s, RX 2.488 Gbit/s                      |
+| TX power                  | 0.5 ~ 5 dBm                                           |
+| Extinction ratio          | ≥ 8.2 dB                                              |
+| Receiver sensitivity      | ≤ -27 dBm                                             |
+| Overload                  | ≥ -8 dBm                                              |
+| Power supply              | 3.3 V                                                 |
+| Maximum power consumption | 1.5 W                                                 |
+| Operating temperature     | -40 °C ~ +85 °C (shell temperature)                   |
+| Operating humidity        | 5% ~ 95% RH (non-condensing)                          |
+| Dimensions (H x W x D)    | 56.5 mm x 13.6 mm x 12.7 mm                           |
+| Weight                    | about 23 g                                            |
+| MAC addresses             | up to 1K                                              |
+| Other                     | Type B dual-homing (50 ms switching), secure boot     |
+
+# Miscellaneous Links
+
+- [Huawei OptiXstar S600E](https://e.huawei.com/it/products/optical-terminal/optixstar-s600e)
+- [Huawei OptiXstar S600E Datasheet (Scribd)](https://www.scribd.com/document/956550051/Huawei-OptiXstar-S600E-Datasheet-04)
+- [Huawei OptiXstar S800E](/xgs/ont-huawei-optixstar-s800e)
+- [Huawei MA5671A](/ont-huawei-ma5671a)
diff --git a/ont/ont-sercomm-fg1000b-11.md b/ont/ont-sercomm-fg1000b-11.md
index d3d36c68..35494c4b 100644
--- a/ont/ont-sercomm-fg1000b-11.md
+++ b/ont/ont-sercomm-fg1000b-11.md
@@ -1,6 +1,6 @@
 ---
-title: Sercomm FG1000B.11s
+title: Sercomm FG1000B.11
 has_children: false
 redirect_to: /ont-sercomm-fg1000b
-parent: CIG
+parent: Sercomm
 ---
diff --git a/ont/ont-sercomm-fg1000b.md b/ont/ont-sercomm-fg1000b.md
index eb2d677c..f8591e67 100644
--- a/ont/ont-sercomm-fg1000b.md
+++ b/ont/ont-sercomm-fg1000b.md
@@ -1,6 +1,7 @@
 ---
 title: Sercomm FG1000B
 has_children: false
+alias: Telekom Glasfaser-Modem 2 (FG1000B.11)
 parent: Sercomm
 ---
 
diff --git a/ont/ont-vsol-v2802rh.md b/ont/ont-vsol-v2802rh.md
index ef7c50f1..0077518f 100644
--- a/ont/ont-vsol-v2802rh.md
+++ b/ont/ont-vsol-v2802rh.md
@@ -1,6 +1,7 @@
 ---
 title: V-SOL V2802RH
 has_children: false
+alias: Uplink GP502R
 parent: V-SOL
 ---
 
diff --git a/ont/ont-zisa-op151s.md b/ont/ont-zisa-op151s.md
index f3142848..ea9557ff 100644
--- a/ont/ont-zisa-op151s.md
+++ b/ont/ont-zisa-op151s.md
@@ -1,6 +1,7 @@
 ---
 title: Zisa OP151S
 has_children: false
+alias: T&W TW2362H-CDEL
 parent: Zisa
 ---
 
@@ -45,7 +46,6 @@ Some USB TTL adapters label TX and RX pins the other way around: try to swap the
 
 - [Halny HL-GSFP](/ont-halny-hl-gsfp)
 - [D-LINK DPN-100-Rev-A2](/ont-d-link-dpn-100-rev-a2)
-- [Zisa OP151s](/ont-zisa-op151s)
 - [T&W TW2362H-CDEL](/ont-t-w-tw2362h-cdel)
 
 # Miscellaneous Links
diff --git a/ont/ont-zyxel-pmg1005-t20c.md b/ont/ont-zyxel-pmg1005-t20c.md
new file mode 100644
index 00000000..acab34cb
--- /dev/null
+++ b/ont/ont-zyxel-pmg1005-t20c.md
@@ -0,0 +1,44 @@
+---
+title: Zyxel PMG1005-T20C
+has_children: false
+parent: Zyxel
+---
+
+# Hardware Specifications
+
+|                 |                                                   |
+| --------------- | ------------------------------------------------- |
+| Vendor/Brand    | Zyxel                                             |
+| Model           | PMG1005-T20C                                      |
+| Chipset         |                                                   |
+| Flash           |                                                   |
+| RAM             |                                                   |
+| System          |                                                   |
+| 2.5GBaseT       | No (1x GbE LAN)                                   |
+| Optics          |                                                   |
+| IP address      | 192.168.1.1                                       |
+| Web Gui         | ✅ user `admin`, password on the device label     |
+| SSH             |                                                   |
+| Telnet          |                                                   |
+| Serial          |                                                   |
+| Serial baud     |                                                   |
+| Serial encoding |                                                   |
+| Form Factor     | ONT                                               |
+
+The PMG1005-T20C is a GPON SFU (Single Family Unit) with one GPON uplink and one GbE LAN port, working as a simple Layer-2 bridge. It is the successor of the [PMG1005-T20B](/ont-zyxel-pmg1005-t20b).
+
+The web interface allows to change the admin password, see traffic statistics, upgrade the firmware and reset to factory defaults.
+
+## LEDs
+
+| LED   | Color | Status                                                                    |
+| ----- | ----- | ------------------------------------------------------------------------- |
+| POWER | Green | On: power on and system ready                                             |
+| PON   | Green | On: GPON link up. Blinking: synchronizing with the OLT                    |
+| LOS   | Red   | On: no optical signal. Blinking: weak optical signal                      |
+| LAN   | Green | On: Ethernet link up. Blinking: transmitting/receiving data               |
+
+# Miscellaneous Links
+
+- [Zyxel PMG1005-T20B/T20C](https://www.zyxel.com/service-provider/global/en/products/fiber-oltsonts/gpon/sfus/pmg1005-series)
+- [PMG1005-T20C Quick Start Guide](https://spdl.zyxel.com/PMG1005-T20C/quick_start_guide/PMG1005-T20C_Quick_start_guide_002.pdf)
diff --git a/public/assets/img/AVM_G-95SP/module.png b/public/assets/img/AVM_G-95SP/module.png
new file mode 100644
index 00000000..40b85593
Binary files /dev/null and b/public/assets/img/AVM_G-95SP/module.png differ
diff --git a/tools/ttl-uart-adapter.md b/tools/ttl-uart-adapter.md
index 0d67e191..26818540 100644
--- a/tools/ttl-uart-adapter.md
+++ b/tools/ttl-uart-adapter.md
@@ -12,4 +12,23 @@ TTL adapters can be easily found on Amazon, the most recommended one being:
 
 - DSD TECH USB to TTL Serial Adapter with FTDI FT232RL Chip [Amazon.com](https://www.amazon.com/dp/B07BBPX8B8) [Amazon.it](https://www.amazon.it/dp/B07BBPX8B8)
 
-Alternatively, an [Arduino can be used to emulate a TTL adapter](https://create.arduino.cc/projecthub/PatelDarshil/ways-to-use-arduino-as-usb-to-ttl-converter-475533)
\ No newline at end of file
+Alternatively, an [Arduino can be used to emulate a TTL adapter](https://create.arduino.cc/projecthub/PatelDarshil/ways-to-use-arduino-as-usb-to-ttl-converter-475533)
+
+# Serial console of the SFP sticks
+
+The SFP MSA does not define a UART, so the manufacturers reuse some low speed pins of the 20-pin SFP edge connector:
+
+| Pins           | Modules                                                                                                    |
+| -------------- | ---------------------------------------------------------------------------------------------------------- |
+| 2 and 7        | Most of the sticks: Huawei MA5671A, Nokia G-010S-P, FS.com GPON-ONU-34-20BI, Realtek RTL960x based sticks, BFW WAS-110 |
+| 3 and 6        | Nokia G-010S-A                                                                                             |
+| 4/5 or 8/9     | Some other modules (SDA/SCL or RX_LOS/RS1)                                                                 |
+
+- Power the stick with +3.3 V on pins 15/16 (VccR/VccT) and ground on a Vee pin (e.g. 10, 14 or 17).
+- The SFP logic is 3.3 V: do not use a 5 V adapter.
+- Almost all the sticks use 115200 8-N-1.
+- Cross the wires (stick TX to adapter RX and vice versa); if there is no output after power-up, swap pins 2 and 7.
+
+To avoid soldering, use an SFP-to-TTL breakout (an SFP cage with all the 20 pins on headers), a soldered harness or a pogo-pin jig. The pinout of each stick is on its page.
+
+See [GPON SFP Serial Console](https://github.com/tomav/gpon-sfp-serial-console) for a vendor-neutral guide.
\ No newline at end of file