diff --git a/retroshare-nogui/src/introserver.cc b/retroshare-nogui/src/introserver.cc
index bf03cbe1d..30bdbd0ba 100644
--- a/retroshare-nogui/src/introserver.cc
+++ b/retroshare-nogui/src/introserver.cc
@@ -130,11 +130,19 @@ int RsIntroServer::setupChatLobbies(std::string &genericLobbyName)
 	std::string englishLobbyName = LOBBY_BASENAME;
 	std::string germanLobbyName  = LOBBY_BASENAME;
 	std::string frenchLobbyName  = LOBBY_BASENAME;
+	std::string spanishLobbyName  = LOBBY_BASENAME;
+	
+	std::string englishLobbyTopic  = "Welcome!";
+	std::string germanLobbyTopic   = "Willkommen !";
+	std::string frenchLobbyTopic   = "Bienvenue !";
+	std::string spanishLobbyTopic  = "Bienvenido !";
+
 
 	genericLobbyName += " " + trimmedstr;
 	englishLobbyName += " (EN) " + trimmedstr;
 	germanLobbyName  += " (DE) " + trimmedstr;
 	frenchLobbyName  += " (FR) " + trimmedstr;
+	spanishLobbyName += " (ES) " + trimmedstr;
 
 	std::string englishTopic = "Connect to this lobby to meet new friends" ;
 	std::string frenchTopic = "Connectez vous a ce lobby pour rencontrer de nouveaux amis" ;
@@ -143,9 +151,10 @@ int RsIntroServer::setupChatLobbies(std::string &genericLobbyName)
 	std::list<std::string> emptyList;
 	uint32_t lobby_privacy_type = RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC;
 	
-	mEnglishLobby = rsMsgs->createChatLobby(englishLobbyName,englishTopic, emptyList, lobby_privacy_type);
-	mFrenchLobby = rsMsgs->createChatLobby(frenchLobbyName,frenchTopic, emptyList, lobby_privacy_type);
-	mGermanLobby = rsMsgs->createChatLobby(germanLobbyName,germanTopic, emptyList, lobby_privacy_type);
+	mEnglishLobby = rsMsgs->createChatLobby(englishLobbyName, englishLobbyTopic, emptyList, lobby_privacy_type);
+	mFrenchLobby = rsMsgs->createChatLobby(frenchLobbyName, frenchLobbyTopic, emptyList, lobby_privacy_type);
+	mGermanLobby = rsMsgs->createChatLobby(germanLobbyName, germanLobbyTopic, emptyList, lobby_privacy_type);
+	mSpanishLobby = rsMsgs->createChatLobby(spanishLobbyName, spanishLobbyTopic, emptyList, lobby_privacy_type);
 
 	return 1;
 }
diff --git a/retroshare-nogui/src/introserver.h b/retroshare-nogui/src/introserver.h
index 13c110e51..ebd2bc9dc 100644
--- a/retroshare-nogui/src/introserver.h
+++ b/retroshare-nogui/src/introserver.h
@@ -68,6 +68,7 @@ int    mMaxPeerAge;
 	ChatLobbyId mEnglishLobby;
 	ChatLobbyId mFrenchLobby;
 	ChatLobbyId mGermanLobby;
+	ChatLobbyId mSpanishLobby;
 };