diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index d9221a518d52a11e36c47c54f08cb12cdc708350..1f77af16ca9074ab946a9c56e49c986aad7461bd 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -263,6 +263,7 @@ NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, U
 	LOG4CXX_INFO(logger, "Listening on host " << CONFIG_STRING(m_config, "service.backend_host") << " port " << CONFIG_STRING(m_config, "service.backend_port"));
 
 	unsigned long pid = exec_(CONFIG_STRING(m_config, "service.backend"), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
+	LOG4CXX_INFO(logger, "Tried to spawn first backend with pid " << pid);
 	LOG4CXX_INFO(logger, "Backend should now connect to Spectrum2 instance. Spectrum2 won't accept any connection before backend connects");
 
 #ifndef _WIN32
@@ -521,6 +522,20 @@ void NetworkPluginServer::handleBuddyChangedPayload(const std::string &data) {
 	}
 }
 
+void NetworkPluginServer::handleBuddyRemovedPayload(const std::string &data) {
+	pbnetwork::Buddy payload;
+	if (payload.ParseFromString(data) == false) {
+		// TODO: ERROR
+		return;
+	}
+
+	User *user = m_userManager->getUser(payload.username());
+	if (!user)
+		return;
+
+	user->getRosterManager()->removeBuddy(payload.buddyname());
+}
+
 void NetworkPluginServer::handleParticipantChangedPayload(const std::string &data) {
 	pbnetwork::Participant payload;
 	if (payload.ParseFromString(data) == false) {
@@ -825,6 +840,9 @@ void NetworkPluginServer::handleDataRead(Backend *c, boost::shared_ptr<Swift::Sa
 			case pbnetwork::WrapperMessage_Type_TYPE_FT_DATA:
 				handleFTDataPayload(c, wrapper.payload());
 				break;
+			case pbnetwork::WrapperMessage_Type_TYPE_BUDDY_REMOVED:
+				handleBuddyRemovedPayload(wrapper.payload());
+				break;
 			default:
 				return;
 		}