diff --git a/pkg/remote/remote.go b/pkg/remote/remote.go
index d28f028c..8640d5c2 100644
--- a/pkg/remote/remote.go
+++ b/pkg/remote/remote.go
@@ -405,6 +405,12 @@ func (msh *MShellProc) Disconnect() {
 	msh.ServerProc.Close()
 }
 
+func (msh *MShellProc) GetRemoteName() string {
+	msh.Lock.Lock()
+	defer msh.Lock.Unlock()
+	return msh.Remote.GetName()
+}
+
 func (msh *MShellProc) Launch() {
 	remoteCopy := msh.getRemoteCopy()
 	logf(&remoteCopy, "starting launch")
@@ -774,7 +780,7 @@ func (msh *MShellProc) ProcessPackets() {
 		}
 		if pk.GetType() == packet.MessagePacketStr {
 			msgPacket := pk.(*packet.MessagePacketType)
-			fmt.Printf("# %s\n", msgPacket.Message)
+			fmt.Printf("# [remote %s] [%s] %s\n", msh.GetRemoteName(), msgPacket.CK, msgPacket.Message)
 			continue
 		}
 		if pk.GetType() == packet.RawPacketStr {