diff --git a/TODO-RELEASE b/TODO-RELEASE
new file mode 100644
index 000000000..dde4b72f2
--- /dev/null
+++ b/TODO-RELEASE
@@ -0,0 +1,10 @@
+# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
+# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
+# In short:
+# LIBVERSION=c:r:a
+# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
+# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0.
+# If any interfaces have been added since the last public release: c:r:a + 1.
+# If any interfaces have been removed or changed since the last public release: c:r:0.
+#library	what		description / commit summary line
+manual				needs common chapter cs7-config.adoc from osmo-gsm-manuals > 0.3.0
diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc
index e8320a736..688fbbef2 100644
--- a/doc/manuals/chapters/running.adoc
+++ b/doc/manuals/chapters/running.adoc
@@ -107,20 +107,21 @@ running on the same interface:
 
 ==== Configure SCCP/M3UA to accept _A_ and _IuCS_ links
 
-OsmoMSC will contact an STP instance to establish an SCCP/M3UA link. BSC and
-HNBGW will then reach the MSC via this link. By default, an STP instance is
-assumed to listen on the default M3UA port (2905) on the local host.
+OsmoMSC acts as client to contact an STP instance and establish an SCCP/M3UA
+link.
 
-Establishing an SCCP/M3UA link towards an STP instance not on the local host
-can be configured as follows:
+An example configuration of OsmoMSC's SCCP link:
 
 ----
 cs7 instance 0
- asp my-OsmoMSC 2905 0 m3ua
-  ! IP address of the remote STP:
-  remote-ip 10.23.24.1
+ point-code 0.23.1
+ asp asp-clnt-OsmoMSC-A-Iu 2905 0 m3ua
+  remote-ip 127.0.0.1
+  sctp-role client
 ----
 
+This configuration is explained in detail in <<cs7_config>>.
+
 Note that _A_ and _IuCS_ may use different SCCP instances, if so desired:
 
 ----
@@ -135,21 +136,6 @@ msc
  cs7-instance-iu 1
 ----
 
-A full configuration needs an `asp` on an `as` -- an Application Server Process
-running on an Application Server -- as well as a local point code and routing
-configuration. The SCCP VTY automatically creates those parts that are missing,
-by assuming sane defaults. A complete configuration would look like this:
-
-----
-cs7 instance 0
- point-code 0.23.1
- asp my-OsmoMSC-A-Iu 2905 0 m3ua
-  remote-ip 127.0.0.1
- as my-as-for-OsmoMSC-A-Iu m3ua
-  asp my-OsmoMSC-A-Iu
-  routing-key 0 0.23.1
-----
-
 ==== Configure GSUP to reach the HLR
 
 OsmoMSC will assume a GSUP server (OsmoHLR) to run on the local host and the
diff --git a/doc/manuals/osmomsc-usermanual.adoc b/doc/manuals/osmomsc-usermanual.adoc
index d680a5119..848d9c0dd 100644
--- a/doc/manuals/osmomsc-usermanual.adoc
+++ b/doc/manuals/osmomsc-usermanual.adoc
@@ -22,6 +22,8 @@ include::./common/chapters/vty.adoc[]
 
 include::./common/chapters/logging.adoc[]
 
+include::./common/chapters/cs7-config.adoc[]
+
 include::{srcdir}/chapters/net.adoc[]
 
 include::./common/chapters/smpp.adoc[]