diff --git a/src/satip/rtp.c b/src/satip/rtp.c
index 5679f7a..5e12c60 100644
--- a/src/satip/rtp.c
+++ b/src/satip/rtp.c
@@ -910,7 +910,7 @@ satip_rtcp_thread(void *aux)
       if (tvhtrace_enabled()) {
         msg[len] = '\0';
         tcp_get_str_from_ip(&rtp->peer2, addrbuf, sizeof(addrbuf));
-        tvhtrace(LS_SATIPS, "RTCP send to %s:%d : %s", addrbuf, ntohs(IP_PORT(rtp->peer2)), msg + 16);
+        tvhtrace(LS_SATIPS, "RTCP send to %s:%d (sock:%d): %s", addrbuf, ntohs(IP_PORT(rtp->peer2)),(rtp->port == RTS
P_TCP_DATA)? rtp->fd_rtp:rtp->fd_rtcp, msg + 16);
       }
       if (rtp->port == RTSP_TCP_DATA) {
         err = satip_rtp_tcp_data(rtp, 1, msg, len);
@@ -925,8 +925,8 @@ satip_rtcp_thread(void *aux)
       if (r < 0) {
         if (err != ECONNREFUSED) {
           tcp_get_str_from_ip(&rtp->peer2, addrbuf, sizeof(addrbuf));
-          tvhwarn(LS_SATIPS, "RTCP send to error %s:%d : %s",
-                  addrbuf, ntohs(IP_PORT(rtp->peer2)), strerror(err));
+          tvhwarn(LS_SATIPS, "RTCP send to error %s:%d (sock:%d): %s",
+                  addrbuf, ntohs(IP_PORT(rtp->peer2)),(rtp->port == RTSP_TCP_DATA)? rtp->fd_rtp:rtp->fd_rtcp, strerro
r(err));
         } else {
           rtp->disable_rtcp = 1;
         }
diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index 3c0baf9..4c2e08d 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -1163,9 +1163,9 @@ play:
   if (mpegts_pid_dump(&rs->pids, buf + r, sizeof(buf) - r, 0, 0) == 0)
     tvh_strlcatf(buf, sizeof(buf), r, "<none>");

-  tvhdebug(LS_SATIPS, "%i/%s/%d: %s from %s:%d %s",
+  tvhdebug(LS_SATIPS, "%i/%s/%d: %s from %s:%d (sock:%d) %s",
            rs->frontend, rs->session, rs->stream,
-           caller, hc->hc_peer_ipstr, ntohs(IP_PORT(*hc->hc_peer)), buf);
+           caller, hc->hc_peer_ipstr, ntohs(IP_PORT(*hc->hc_peer)), hc->hc_fd, buf);

 ok:
   errcode = 0;
@@ -1484,8 +1484,8 @@ rtsp_process_teardown(http_connection_t *hc)
     return 0;
   }

-  tvhdebug(LS_SATIPS, "-/%s/%i: teardown from %s:%d",
-           hc->hc_session, stream, hc->hc_peer_ipstr, ntohs(IP_PORT(*hc->hc_peer)));
+  tvhdebug(LS_SATIPS, "-/%s/%i: teardown from %s:%d (sock:%d)",
+           hc->hc_session, stream, hc->hc_peer_ipstr, ntohs(IP_PORT(*hc->hc_peer)), hc->hc_fd);

   pthread_mutex_lock(&rtsp_lock);
   rs = rtsp_find_session(hc, stream);