diff --git a/client.cpp b/client.cpp
index 56ac32d8bf..41ab78fe9f 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1244,7 +1244,7 @@ void Client::setCaption( const QString& s, bool force )
         bool was_suffix = ( !cap_suffix.isEmpty());
         QString machine_suffix;
         if( !isLocalMachine( wmClientMachine( false )))
-            machine_suffix = "@" + wmClientMachine( true );
+            machine_suffix = " <@" + wmClientMachine( true ) + ">";
         cap_suffix = machine_suffix;
         if ( ( !isSpecialWindow() || isToolbar()) && workspace()->findClient( FetchNameInternalPredicate( this ))) 
             {