diff --git a/README.rst b/README.rst
index f8fb29a0..796f70b4 100644
--- a/README.rst
+++ b/README.rst
@@ -117,6 +117,7 @@ Features
   - active sessions;
   - **GTSM** (Generalized TTL Security Mechanism - `RFC5082`_);
   - **ADD-PATH** capability (`RFC7911`_).
+  - `RFC8950`_ **IPv6 NEXT_HOP for IPv4 routes**.
 
 - Automatic building of clients list:
 
@@ -140,6 +141,7 @@ More feature are already planned: see the `Future work <https://arouteserver.rea
 .. _RFC9234: https://tools.ietf.org/html/rfc9234
 .. _RFC5082: https://tools.ietf.org/html/rfc5082
 .. _RFC7911: https://tools.ietf.org/html/rfc7911
+.. _RFC8950: https://tools.ietf.org/html/rfc8950
 
 Full documentation
 ------------------
diff --git a/docs/EXAMPLES.rst b/docs/EXAMPLES.rst
index 44ffda55..ec460a3d 100644
--- a/docs/EXAMPLES.rst
+++ b/docs/EXAMPLES.rst
@@ -113,7 +113,7 @@ A list of BGP communities is also automatically built.
    limitations
    
    Which BGP daemon will be used? [bird/openbgpd] bird
-   Which version? [1.6.3/1.6.4/1.6.6/1.6.7/1.6.8/2.0.7/2.0.7+b962967e/2.0.8/2.0.9/2.0.10/2.0.11/2.13/2.14/3.0] 2.14
+   Which version? [1.6.3/1.6.4/1.6.6/1.6.7/1.6.8/2.0.7/2.0.7+b962967e/2.0.8/2.0.9/2.0.10/2.0.11/2.13/2.14/2.15/3.0] 2.15
    
    Router server's ASN
    ===================
diff --git a/docs/FEATURES.rst b/docs/FEATURES.rst
index 782ba8db..a0b1c7b4 100644
--- a/docs/FEATURES.rst
+++ b/docs/FEATURES.rst
@@ -107,6 +107,7 @@ Features
   - active sessions;
   - **GTSM** (Generalized TTL Security Mechanism - `RFC5082`_);
   - **ADD-PATH** capability (`RFC7911`_).
+  - `RFC8950`_ **IPv6 NEXT_HOP for IPv4 routes**.
 
 - Automatic building of clients list:
 
@@ -130,3 +131,4 @@ More feature are already planned: see the `Future work <https://arouteserver.rea
 .. _RFC9234: https://tools.ietf.org/html/rfc9234
 .. _RFC5082: https://tools.ietf.org/html/rfc5082
 .. _RFC7911: https://tools.ietf.org/html/rfc7911
+.. _RFC8950: https://tools.ietf.org/html/rfc8950
diff --git a/docs/LIVETESTS_SCENARIOS.rst b/docs/LIVETESTS_SCENARIOS.rst
index 5c6e9efd..00f093b6 100644
--- a/docs/LIVETESTS_SCENARIOS.rst
+++ b/docs/LIVETESTS_SCENARIOS.rst
@@ -9,6 +9,7 @@
    LIVETESTS_SCENARIOS_gshut
    LIVETESTS_SCENARIOS_max_prefix
    LIVETESTS_SCENARIOS_path_hiding
+   LIVETESTS_SCENARIOS_rfc8950
    LIVETESTS_SCENARIOS_rich_example
    LIVETESTS_SCENARIOS_roles
    LIVETESTS_SCENARIOS_rpki
diff --git a/docs/LIVETESTS_SCENARIOS_rfc8950.rst b/docs/LIVETESTS_SCENARIOS_rfc8950.rst
new file mode 100644
index 00000000..9e512347
--- /dev/null
+++ b/docs/LIVETESTS_SCENARIOS_rfc8950.rst
@@ -0,0 +1 @@
+.. include:: ../tests/live_tests/scenarios/rfc8950/README.rst
diff --git a/docs/SUPPORTED_SPEAKERS_FEATURES.txt b/docs/SUPPORTED_SPEAKERS_FEATURES.txt
index 8a3b8937..cb6db326 100644
--- a/docs/SUPPORTED_SPEAKERS_FEATURES.txt
+++ b/docs/SUPPORTED_SPEAKERS_FEATURES.txt
@@ -80,6 +80,8 @@ Multihop sessions                                             Yes :sup:`2` Yes :
 ------------------------------------------------------------- ------------ ------------ ------------ ------------ ------------ 
 ADD_PATH capability (RFC7911)                                 Yes          Yes          Yes          Yes          Yes          
 ------------------------------------------------------------- ------------ ------------ ------------ ------------ ------------ 
+IPv6 NEXT_HOP for IPv4 routes (RFC8950)                       No           Yes          Yes          No           No           
+------------------------------------------------------------- ------------ ------------ ------------ ------------ ------------ 
 ============================================================= ============ ============ ============ ============ ============ 
 
 
diff --git a/examples/auto-config/README.rst b/examples/auto-config/README.rst
index caab7b38..afb574b0 100644
--- a/examples/auto-config/README.rst
+++ b/examples/auto-config/README.rst
@@ -22,7 +22,7 @@ A list of BGP communities is also automatically built.
    limitations
    
    Which BGP daemon will be used? [bird/openbgpd] bird
-   Which version? [1.6.3/1.6.4/1.6.6/1.6.7/1.6.8/2.0.7/2.0.7+b962967e/2.0.8/2.0.9/2.0.10/2.0.11/2.13/2.14/3.0] 2.14
+   Which version? [1.6.3/1.6.4/1.6.6/1.6.7/1.6.8/2.0.7/2.0.7+b962967e/2.0.8/2.0.9/2.0.10/2.0.11/2.13/2.14/2.15/3.0] 2.15
    
    Router server's ASN
    ===================
diff --git a/tests/live_tests/scenarios/rfc8950/README.md b/tests/live_tests/scenarios/rfc8950/README.rst
similarity index 90%
rename from tests/live_tests/scenarios/rfc8950/README.md
rename to tests/live_tests/scenarios/rfc8950/README.rst
index 1f4a49b6..04caf9eb 100644
--- a/tests/live_tests/scenarios/rfc8950/README.md
+++ b/tests/live_tests/scenarios/rfc8950/README.rst
@@ -1,8 +1,10 @@
-# RFC8950 scenario
+RFC8950 scenario
+****************
 
 A scenario to test announcements of IPv4 routes with an IPv6 NEXT_HOP, over an IPv6 session.
 
-## AS1_1
+AS1_1
+-----
 
 - `AS1_v4_route1`: accepted.
 - `AS1_v4_route2`: rejected, not in IRR data.
@@ -15,10 +17,12 @@ A scenario to test announcements of IPv4 routes with an IPv6 NEXT_HOP, over an I
 - `AS1_v4_route10`: accepted (RPKI BOV VALID).
 - `AS1_v4_route11`: rejected (RPKI BOC INVALID).
 
-## AS1_2
+AS1_2
+-----
 
 - `AS1_v4_route6`: announced with AS1_1 NEXT_HOP: accepted (same-as).
 
-## AS2_1
+AS2_1
+-----
 
 - `AS2_v4_route12`: accepted (NEXT_HOP authorized-next-hop)
diff --git a/utils/build_supported_speakers_table.py b/utils/build_supported_speakers_table.py
index 0bef5de2..e929c7b4 100755
--- a/utils/build_supported_speakers_table.py
+++ b/utils/build_supported_speakers_table.py
@@ -298,12 +298,12 @@ def put_table_line(lengths, char="="):
     "openbgpd": True,
     "openbgpd_portable": True,
 })
-add_feature("ADD_PATH capability (RFC7911)", {
-    "bird": True,
+add_feature("IPv6 NEXT_HOP for IPv4 routes (RFC8950)", {
+    "bird": False,
     "bird2": True,
     "bird3": True,
-    "openbgpd": True,
-    "openbgpd_portable": True,
+    "openbgpd": False,
+    "openbgpd_portable": False,
 })