diff --git a/README.md b/README.md
index f117535d..ff2c359d 100644
--- a/README.md
+++ b/README.md
@@ -576,11 +576,38 @@ Note: When now setting up a debug session in the Xilinx SDK or Eclipse, the host
 to localhost instead of the IP address of the Q7S.
 
 # <a id="tmtc-testing"></a> TMTC testing
-The OBSW supports sending PUS TM packets via TCP or the PDEC IP Core which transmits the data as CADU frames. To make the CADU frames receivabel by the [TMTC porgram](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc), a python script is running as systemd service on the flatsat PC which forwards TCP commands to the TCP server of the OBC and reads CADU frames from a serial interface. The PUS packets transported with the CADU frames are extracted and forwared to the TMTC program's TCP client. The code of the TMTC bridge can be found [here](https://egit.irs.uni-stuttgart.de/eive/tmtc-bridge). To connect the TMTC program to the TMTC-bridge a port forwarding from a host must be set up with the following command:
-````
+
+The OBSW supports sending PUS TM packets via TCP or the PDEC IP Core which transmits the data as
+CADU frames. To make the CADU frames receivabel by the
+[TMTC porgram](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc), a python script is running as
+`systemd` service named `tmtc_bridge` on the flatsat PC which forwards TCP commands to the TCP
+server of the OBC and reads CADU frames from a serial interface.
+
+You can check whether the service is running the following command on the flatsat PC
+
+```sh
+systemctl status tmtc_bridge
+```
+
+The PUS packets transported with the CADU frames are extracted
+and forwared to the TMTC program's TCP client. The code of the TMTC bridge can be found
+[here](https://egit.irs.uni-stuttgart.de/eive/tmtc-bridge). To connect the TMTC program to the
+TMTC-bridge a port forwarding from a host must be set up with the following command:
+
+```sh
 ssh -L 1537:127.0.0.1:7100 eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 -t bash
-````
-Note: The encoding of the TM packets and conversion of CADU frames takes some time. Thus the replies are received with a larger delay compared to a direct TCP connection.
+```
+
+You can print the output of the `systemd` service with
+
+```sh
+journalctl -u tmtc_bridge
+```
+
+This can be helpful to determine whether any TCs arrive or TMs are coming back.
+
+Note: The encoding of the TM packets and conversion of CADU frames takes some time.
+Thus the replies are received with a larger delay compared to a direct TCP connection.
 
 # <a id="direct-debugging"></a> Direct Debugging
 
diff --git a/fsfw b/fsfw
index a578f039..b985bf51 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit a578f0390bce6c0a3d1d1e8d59764072f1075867
+Subproject commit b985bf5167be74c0d43bd70c501eb5f9640bd99e
diff --git a/scripts/q7s-port.sh b/scripts/q7s-port.sh
index 82152898..e350d4c2 100755
--- a/scripts/q7s-port.sh
+++ b/scripts/q7s-port.sh
@@ -2,7 +2,8 @@
 echo "Setting up all Q7S ports"
 echo "-L 1534:192.168.133.10:1534 for connection to TCF agent"
 echo "-L 1535:192.168.133.10:22 for file transfers"
-echo "-L 1536:192.168.133.10:7301 for TMTC commanding"
+echo "-L 1536:192.168.133.10:7301 for TMTC commanding using the TCP/IP IF"
+echo "-L 1537:127.0.0.1:7100 for TMTC commanding using the CCSDS IF"
 
 ssh -L 1534:192.168.133.10:1534 \
    -L 1535:192.168.133.10:22 \
diff --git a/tmtc b/tmtc
index 1a176582..7b49babb 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 1a176582883aed989870819e5e57e0ce0a78ecda
+Subproject commit 7b49babb1febb3959f0f817aa4b4ce4c32d6d21c