diff --git a/doc/manuals/gb/bssgp.adoc b/doc/manuals/gb/bssgp.adoc
index 18f1842..7dcf3f8 100644
--- a/doc/manuals/gb/bssgp.adoc
+++ b/doc/manuals/gb/bssgp.adoc
@@ -4,14 +4,14 @@
 === List of Messages
 
 The following tables list the BSSGP messages used by OsmoPCU, grouped
-by their level of compliance with 3GPP TS 08.18.
+by their level of compliance with 3GPP TS 48.018.
 
-==== Messages Compliant With TS 08.18
+==== Messages Compliant With TS 48.018
 
-.Messages compliant with TS 08.18
+.Messages compliant with TS 48.018
 [options="header",cols="10%,10%,20%,35%,5%,20%"]
 |===
-| TS 08.18 § | type code (hex) | This document § | Message | <-/-> | Received/Sent by OsmoPCU
+| TS 48.018 § | type code (hex) | This document § | Message | <-/-> | Received/Sent by OsmoPCU
 6+<| *RL and BSSGP SAP Messages:*
 | 10.2.1 | 0x00 | <<dl_unit_data>> | DL-UNITDATA | <- | Received
 | 10.2.2 | 0x01 | <<ul_unit_data>> | UL-UNITDATA | -> | Sent
@@ -44,10 +44,10 @@
 [[not_impl]]
 ==== Messages Not Implemented by OsmoPCU
 
-.3GPP TS 08.18 messages not implemented by OsmoPCU
+.3GPP TS 48.018 messages not implemented by OsmoPCU
 [options="header",cols="10%,10%,80%"]
 |===
-| TS 08.18 § | type code (hex) | Message
+| TS 48.018 § | type code (hex) | Message
 3+<| *RL (relay) and BSSGP SAP Messages:*
 | 10.2.4 | 0x03 | PTM-UNITDATA
 3+<| *GMM (GPRS mobility management) SAP Messages:*
@@ -78,7 +78,7 @@
 [[dl_unit_data]]
 ==== DL-UNITDATA
 
-This message conforms to 3GPP TS 08.18 § 10.2.1, with the following
+This message conforms to 3GPP TS 48.018 § 10.2.1, with the following
 limitations:
 
 * OsmoPCU does not support QoS
@@ -87,7 +87,7 @@
 ._DL-UNITDATA_ IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.18 § | IE Name | Handling
+| TS 48.018 § | IE Name | Handling
 | 11.3.28 | QoS Profile | _ignored_
 | 11.3.22 | MS Radio Access Capability | _ignored_
 | 11.3.27 | Priority | _ignored_
@@ -100,7 +100,7 @@
 [[ul_unit_data]]
 ==== UL-UNITDATA
 
-This message conforms to 3GPP TS 08.18 § 10.2.2, with the following limitations:
+This message conforms to 3GPP TS 48.018 § 10.2.2, with the following limitations:
 
 * OsmoPCU does not send optional IEs - PFI (§ 12.3.42) and LSA
   Identifier List (§ 11.3.18).
@@ -114,7 +114,7 @@
 [[paging_ps]]
 ==== PAGING PS
 
-This message conforms to 3GPP TS 08.18 § 10.3.1, with the following
+This message conforms to 3GPP TS 48.018 § 10.3.1, with the following
 limitations:
 
 * only IMSI and P-TMSI are parsed by OsmoPCU.
@@ -122,7 +122,7 @@
 ._DL-UNITDATA_ IE limitations
 [options="header",cols="10%,30%,60%"]
 |===
-| TS 08.18 § | IE Name | Handling
+| TS 48.018 § | IE Name | Handling
 | 11.3.11 | DRX Parameters | _ignored_
 | 11.3.6 | BVCI | _ignored_
 | 11.3.17 | Location Are | _ignored_
@@ -174,7 +174,7 @@
 [[bvc_reset]]
 ==== BVC-RESET
 
-OsmoPCU never transmits optional Feature bitmap (3GPP TS 08.18 §
+OsmoPCU never transmits optional Feature bitmap (3GPP TS 48.018 §
 11.3.40) IE.
 
 Receiving BVC RESET will cause OsmoPCU to respond with "Unknown BVCI"
@@ -183,24 +183,24 @@
 [[reset_ack]]
 ==== BVC-RESET-ACK
 
-This message conforms to 3GPP TS 08.18 § 10.4.13.
+This message conforms to 3GPP TS 48.018 § 10.4.13.
 
 After receiving it OsmoPCU completes the RESET procedure for BVC
-according to 3GPP TS 08.18 § 8.4.
+according to 3GPP TS 48.018 § 8.4.
 
 [[unblock_ack]]
 ==== BVC-UNBLOCK-ACK
 
-This message conforms to 3GPP TS 08.18 § 10.4.11.
+This message conforms to 3GPP TS 48.018 § 10.4.11.
 
 After receiving it OsmoPCU completes the RESET procedure for BVC
-according to 3GPP TS 08.18 § 8.3.
+according to 3GPP TS 48.018 § 8.3.
 
 [[bvc_unblock]]
 ==== BVC-UNBLOCK
 
-This message conforms to 3GPP TS 08.18 § 10.4.10 and is send by
-OsmoPCU as part of UNBLOCK procedure described in 3GPP TS 08.18 § 8.3.
+This message conforms to 3GPP TS 48.018 § 10.4.10 and is send by
+OsmoPCU as part of UNBLOCK procedure described in 3GPP TS 48.018 § 8.3.
 
 [[flow_ms_ack]]
 ==== FLOW-CONTROL-MS-ACK
@@ -217,11 +217,11 @@
 [[flow_bvc]]
 ==== FLOW-CONTROL-BVC
 
-This message conforms to 3GPP TS 08.18 § 10.4.4, with the following
+This message conforms to 3GPP TS 48.018 § 10.4.4, with the following
 limitations:
 
 * OsmoPCU does not support Current Bucket Level (CBL) feature so
-  Bucket_Full Ratio (TS 08.18 § 11.3.46) IE is not transmitted as part
+  Bucket_Full Ratio (TS 48.018 § 11.3.46) IE is not transmitted as part
   of this message.
 
 [[flush_ll]]
@@ -239,22 +239,22 @@
 [[bssgp_status]]
 ==== STATUS
 
-This message conforms to 3GPP TS 08.18 § 10.4.14.
+This message conforms to 3GPP TS 48.018 § 10.4.14.
 
 === Information Elements Overview
 
 All of the IEs handled by OsmoPCU are listed below, with limitations
-and additions to 3GPP TS 08.18 specified in more detail.
+and additions to 3GPP TS 48.018 specified in more detail.
 
-==== IEs Conforming to 3GPP TS 08.18
+==== IEs Conforming to 3GPP TS 48.018
 
 The following Information Elements are accepted by OsmoPCU. Not all
 IEs are actually evaluated.
 
-.IEs conforming to 3GPP TS 08.18
+.IEs conforming to 3GPP TS 48.018
 [options="header",cols="5%,10%,40%,5%,40%"]
 |===
-| tag (hex) | TS 08.18 § | IE name | <-/-> | Received/Sent by OsmoPCU
+| tag (hex) | TS 48.018 § | IE name | <-/-> | Received/Sent by OsmoPCU
 | 0x00 | 11.3.1 | Alignment Octets | <-/-> | Received/Sent
 | 0x01 | 11.3.2 | Bmax default MS | -> | Sent
 | 0x02 | 11.3.3 | BSS Area Indication | <- | Received
@@ -301,12 +301,12 @@
 | 0x3d | 11.3.47 | Service UTRAN CCO (Cell Change Order) | <- | Received
 |===
 
-==== IEs Not Conforming to 3GPP TS 08.18
+==== IEs Not Conforming to 3GPP TS 48.018
 
-.IEs not conforming to 3GPP TS 08.18
+.IEs not conforming to 3GPP TS 48.018
 [options="header",cols="5%,10%,30%,55%"]
 |===
-| tag (hex) | TS 08.18 § | IE name | Description
+| tag (hex) | TS 48.018 § | IE name | Description
 | 0x18 | 11.3.28 | QoS Profile | Received value is ignored. Sent value is hard-coded to 0x4 (3 octets).
 |===
 
@@ -417,7 +417,7 @@
 ==== Tag
 
 This IE currently only used by OsmoPCU for Flow Control procedure (TS
-08.18 § 8.2). In other cases it's either ignored or unavailable.
+48.018 § 8.2). In other cases it's either ignored or unavailable.
 
 ==== Trace Reference
 
@@ -494,8 +494,8 @@
 
 In addition to the BVCI identifying the OsmoPCU side of BSSGP
 connection, there is also special BVCI which is accepted by OsmoPCU in
-accordance with 3GPP TS 08.18 § 5.4.1: BVCI = 0 represents signaling data
+accordance with 3GPP TS 48.018 § 5.4.1: BVCI = 0 represents signaling data
 between SGSN and PCU in contrast to PTP (Peer-To-Peer) user's data.
 
 The mapping between BSSGP PDUs and signaling or PTP BVCIs is available
-in 3GPP TS 08.18 Table 5.4.
+in 3GPP TS 48.018 Table 5.4.
diff --git a/doc/manuals/gb/ns.adoc b/doc/manuals/gb/ns.adoc
index c94e018..1dc2ed8 100644
--- a/doc/manuals/gb/ns.adoc
+++ b/doc/manuals/gb/ns.adoc
@@ -3,18 +3,18 @@
 === List of Messages
 
 The following tables list the NS messages used by OsmoPCU, grouped by their
-level of compliance with 3GPP TS 08.16.
+level of compliance with 3GPP TS 48.016.
 
-==== Messages Compliant With 3GPP TS 08.16
+==== Messages Compliant With 3GPP TS 48.016
 
 The NS protocol is implemented inside libosmocore so none of the messages below are sent by OsmoPCU explicitly.
 Instead corresponding functions from libosmocore are called which send and receive messages as necessary. See <<ns_init>> for details
 on establishing NS connection.
 
-.Messages compliant with 3GPP TS 08.16
+.Messages compliant with 3GPP TS 48.016
 [options="header",cols="10%,10%,20%,35%,5%,20%"]
 |===
-| TS 08.16 § | type code (hex) | This document § | Message | <-/-> | Received/Sent by OsmoPCU
+| TS 48.016 § | type code (hex) | This document § | Message | <-/-> | Received/Sent by OsmoPCU
 | 9.2.10 | 0x00 | <<ns_unit_data>> | NS-UNITDATA | <-/-> | Received/Sent
 | 9.2.5 | 0x02 | <<ns_reset>> | NS-RESET | <-/-> | Received/Sent
 | 9.2.6 | 0x03 | <<ns_reset_ack>> | NS-RESET-ACK | <-/-> | Received/Sent
@@ -33,7 +33,7 @@
 
 ==== Messages Not Implemented by OsmoPCU
 
-All the NS protocol messages from 3GPP TS 08.16 are implemented in OsmoPCU.
+All the NS protocol messages from 3GPP TS 48.016 are implemented in OsmoPCU.
 
 === Details on Compliant NS Messages
 
@@ -51,13 +51,13 @@
 ==== NS-RESET
 
 This message is send by OsmoPCU in order to initiate reset procedure
-described in 3GPP TS 08.16 § 7.3. The expected reply is NS-RESET-ACK
+described in 3GPP TS 48.016 § 7.3. The expected reply is NS-RESET-ACK
 (<<ns_reset_ack>>) message. If no expected reply is received in 3
 seconds than the sending is retried up to 3 times.  When this message
 is received it is replied with NS-RESET-ACK (<<ns_reset_ack>>).
-It might be ignored under conditions described in 3GPP TS 08.16 § 7.3.1.
+It might be ignored under conditions described in 3GPP TS 48.016 § 7.3.1.
 
-The message conforms to 3GPP TS 08.16 § 9.2.5 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.5 specification.
 
 It contains Cause (<<ie_cause>>), NSVCI (<<ie_nsvci>>) and NSEI (<<ie_nsei>>) IEs.
 
@@ -67,7 +67,7 @@
 This message is sent as a response to proper NS-RESET (<<ns_reset>>)
 message initiating reset procedure.
 
-The message conforms to 3GPP TS 08.16 § 9.2.6 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.6 specification.
 
 It contains NSVCI (<<ie_nsvci>>) and NSEI (<<ie_nsei>>) IEs.
 
@@ -79,9 +79,9 @@
 When this message is sent by OsmoPCU corresponding NS-BLOCK-ACK
 (<<ns_block_ack>>) reply is expected before NS-VC is actually marked
 as blocked.  This behavior follows the blocking procedure described in
-3GPP TS 08.16 § 7.2.
+3GPP TS 48.016 § 7.2.
 
-The message conforms to 3GPP TS 08.16 § 9.2.3 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.3 specification.
 
 It contains Cause (<<ie_cause>>) and NSVCI (<<ie_nsvci>>) IEs.
 
@@ -92,7 +92,7 @@
 correct NS-BLOCK (<<ns_block>>) message.  It is expected as a reply
 for NS-BLOCK (<<ns_block>>) message sent by OsmoPCU.
 
-The message conforms to 3GPP TS 08.16 § 9.2.4 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.4 specification.
 
 It contains NSVCI (<<ie_nsvci>>) IE.
 
@@ -104,9 +104,9 @@
 this message is sent by OsmoPCU corresponding NS-UNBLOCK-ACK
 (<<ns_unblock_ack>>) reply is expected before NS-VC is actually marked
 as unblocked.  This behavior follows the blocking procedure described
-in 3GPP TS 08.16 § 7.2.
+in 3GPP TS 48.016 § 7.2.
 
-The message conforms to 3GPP TS 08.16 § 9.2.8 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.8 specification.
 
 [[ns_unblock_ack]]
 ==== NS-UNBLOCK-ACK
@@ -115,7 +115,7 @@
 is confirmed and thus NS-VC is marked as unblocked.  This message is
 also sent as a reply to NS-UNBLOCK (<<ns_unblock>>) message.
 
-The message conforms to 3GPP TS 08.16 § 9.2.9 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.9 specification.
 
 [[ns_status]]
 ==== NS-STATUS
@@ -123,10 +123,10 @@
 This message is sent to inform other party about error conditions as a
 response to various unexpected PDUs or PDUs with unexpected/missing
 data. If this message is received for unknown NS-VC it is ignored in
-accordance with 3GPP TS 08.16 § 7.5.1, otherwise the error cause is
+accordance with 3GPP TS 48.016 § 7.5.1, otherwise the error cause is
 logged if present in NS-STATUS.
 
-The message conforms to 3GPP TS 08.16 § 9.2.7 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.7 specification.
 
 It contains Cause (<<ie_cause>>) and might (depending on actual error)
 contain NSVCI (<<ie_nsvci>>), NS PDU (<<ie_nspdu>>) and BVCI
@@ -136,13 +136,13 @@
 ==== NS-ALIVE
 
 This message is sent periodically to test connectivity according to
-3GPP TS 08.16 § 4.5.3. The expected response is NS-ALIVE-ACK
+3GPP TS 48.016 § 4.5.3. The expected response is NS-ALIVE-ACK
 (<<ns_alive_ack>>). If no such response arrives within given amount of
 time (3 seconds) than another NS-ALIVE message is sent and failed test
 attempt is recorded.  After 10 failed attempts NS connection is
 considered dead and OsmoPCU tries to reconnect.
 
-The message conforms to 3GPP TS 08.16 § 9.2.1 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.1 specification.
 
 [[ns_alive_ack]]
 ==== NS-ALIVE-ACK
@@ -150,21 +150,21 @@
 This message is sent automatically in reply to NS-ALIVE (<<ns_alive>>)
 message.
 
-The message conforms to 3GPP TS 08.16 § 9.2.2 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.2 specification.
 
 === Information Elements Overview
 
 All of the IEs handled by OsmoPCU are listed below, with limitations and
-additions to 3GPP TS 08.16 specified in more detail.
+additions to 3GPP TS 48.016 specified in more detail.
 
-==== IEs Conforming to 3GPP TS 08.16
+==== IEs Conforming to 3GPP TS 48.016
 
 The following Information Elements are accepted by OsmoPCU.
 
-.IEs conforming to 3GPP TS 08.16
+.IEs conforming to 3GPP TS 48.016
 [options="header",cols="5%,10%,40%,5%,40%"]
 |===
-| tag (hex) | TS 08.16 § | IE name | <-/-> | Received/Sent by OsmoPCU
+| tag (hex) | TS 48.016 § | IE name | <-/-> | Received/Sent by OsmoPCU
 | 0x00 | 10.3.2 | Cause | <-/-> | Received/Sent
 | 0x01 | 10.3.5 | NSVCI | <-/-> | Received/Sent
 | 0x02 | 10.3.3 | NS PDU | <-/-> | Received/Sent
@@ -172,9 +172,9 @@
 | 0x04 | 10.3.6 | NSEI | <-/-> | Received/Sent
 |===
 
-==== IEs Not Conforming to 3GPP TS 08.16
+==== IEs Not Conforming to 3GPP TS 48.016
 
-All IEs defined in 3GPP TS 08.16 § 10.3 are supported by OsmoPCU.
+All IEs defined in 3GPP TS 48.016 § 10.3 are supported by OsmoPCU.
 
 ==== Additional Attributes and Parameters
 
@@ -185,18 +185,18 @@
 [[ie_cause]]
 ==== Cause
 
-This IE contains reason for a procedure or error as described in 3GPP TS 08.16 § 10.3.2.
+This IE contains reason for a procedure or error as described in 3GPP TS 48.016 § 10.3.2.
 
 [[ie_nsvci]]
 ==== NSVCI
 
-This IE represents NSVCI identity described in <<ident>> and 3GPP TS 08.16 § 10.3.5.
+This IE represents NSVCI identity described in <<ident>> and 3GPP TS 48.016 § 10.3.5.
 
 [[ie_nspdu]]
 ==== NS PDU
 
 This IE contains PDU (possibly truncated) which cause error described
-in NS-STATUS message (<<ns_status>>) as described in 3GPP TS 08.16 §
+in NS-STATUS message (<<ns_status>>) as described in 3GPP TS 48.016 §
 10.3.3.
 
 [[ie_nssdu]]
@@ -207,13 +207,13 @@
 [[ie_bvci]]
 ==== BVCI
 
-This IE represents BSSGP identity described in <<ident>> and 3GPP TS 08.16
+This IE represents BSSGP identity described in <<ident>> and 3GPP TS 48.016
 § 10.3.1.
 
 [[ie_nsei]]
 ==== NSEI
 
-This IE represents NSEI identity described in <<ident>> and 3GPP TS 08.16 §
+This IE represents NSEI identity described in <<ident>> and 3GPP TS 48.016 §
 10.3.6.
 
 [[ns_init]]
diff --git a/doc/manuals/osmopcu-gb.adoc b/doc/manuals/osmopcu-gb.adoc
index 00576c9..166059b 100644
--- a/doc/manuals/osmopcu-gb.adoc
+++ b/doc/manuals/osmopcu-gb.adoc
@@ -7,7 +7,7 @@
 == Introduction
 
 This document describes the Gb interface of *OsmoPCU*. Based on 3GPP TS
-08.16 and 08.18, this document indicates which of the 3GPP specified Gb
+48.016 and 48.018, this document indicates which of the 3GPP specified Gb
 messages and IEs are implemented according to 3GPP specifications, which of
 these are not or not fully implemented, as well as OsmoPCU-specific extensions
 to the Gb interface not specified by 3GPP.
@@ -23,8 +23,8 @@
 |3GPP TS 08.58 | version 8.6.0 Release 1999
 |3GPP TS 08.60 | version 8.2.1 Release 1999
 |3GPP TS 12.21 | version 8.0.0 Release 1999
-|3GPP TS 08.16 | version 8.0.1 Release 1999
-|3GPP TS 08.18 | version 8.12.0 Release 1999
+|3GPP TS 48.016 | version 15.0.0 Release 15
+|3GPP TS 48.018 | version 15.0.0 Release 15
 |===
 
 .IETF documents referred to by his document
@@ -74,8 +74,8 @@
 BVCI:: BSSGP Virtual Connection Identifier
 
 For an explanation of those identifiers and their use in the NS and
-BSSGP protocols, please see the relevant 3GPP specifications for NS (TS 08.16)
-and BSSGP (TS 08.18).
+BSSGP protocols, please see the relevant 3GPP specifications for NS (TS 48.016)
+and BSSGP (TS 48.018).
 
 In most cases, all above identities belong to different namespaces and
 must be unique within their respective namespace and within the SGSN