Index: source/ariba/overlay/OverlayBootstrap.cpp
===================================================================
--- source/ariba/overlay/OverlayBootstrap.cpp	(revision 5929)
+++ source/ariba/overlay/OverlayBootstrap.cpp	(revision 5953)
@@ -175,6 +175,23 @@
 	}
 
+	// TODO: --> SIGCOMM hack <--
+	// if we have no overlay neighbors, make sure sdp is loaded
+	// sdp searching is turned off when we have bootstrapped
+	if(overlay->getOverlayNeighbors().size() > 0){
+
+		// switch off sdp when we we _are_ in the spovnet already
+		if(manager.isModuleRegistered(BootstrapManager::BootstrapTypeBluetoothSdp))
+			manager.unregisterModule(BootstrapManager::BootstrapTypeBluetoothSdp);
+
+		return;
+	}
+
+	// make sure sdp is running when we are _not_ in the spovnet
+	if(!manager.isModuleRegistered(BootstrapManager::BootstrapTypeBluetoothSdp))
+		manager.registerModule(BootstrapManager::BootstrapTypeBluetoothSdp);
+
+	//
 	// we have overlay neighbors -> ok
-	if(overlay->getOverlayNeighbors().size() > 0) return;
+	//
 
 	logging_info("overlay not joined, checking for earlier used bootstrap information");