diff --git a/include/discover_poco.php b/include/discover_poco.php
index 6308a982a..bfde3c46d 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -155,6 +155,10 @@ function discover_directory($search) {
  */
 function gs_search_user($search) {
 
+	// Currently disabled, since the service isn't available anymore.
+	// It is not removed since I hope that there will be a successor.
+	return false;
+
 	$a = get_app();
 
 	$url = "http://gstools.org/api/users_search/".urlencode($search);
diff --git a/include/socgraph.php b/include/socgraph.php
index a0dd88df2..0ed209460 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -1244,18 +1244,20 @@ function poco_discover_federation() {
 			poco_check_server("https://".$server->host);
 	}
 
-	// Discover GNU Social Servers
-	if (!get_config('system','ostatus_disabled')) {
-		$serverdata = "http://gstools.org/api/get_open_instances/";
+	// Currently disabled, since the service isn't available anymore.
+	// It is not removed since I hope that there will be a successor.
+	// Discover GNU Social Servers.
+	//if (!get_config('system','ostatus_disabled')) {
+	//	$serverdata = "http://gstools.org/api/get_open_instances/";
 
-		$result = z_fetch_url($serverdata);
-		if ($result["success"]) {
-			$servers = json_decode($result["body"]);
+	//	$result = z_fetch_url($serverdata);
+	//	if ($result["success"]) {
+	//		$servers = json_decode($result["body"]);
 
-			foreach($servers->data AS $server)
-				poco_check_server($server->instance_address);
-		}
-	}
+	//		foreach($servers->data AS $server)
+	//			poco_check_server($server->instance_address);
+	//	}
+	//}
 
 	set_config('poco','last_federation_discovery', time());
 }