diff --git a/discovery.php b/discovery.php
index 7caffcbde..5f54b6e98 100755
--- a/discovery.php
+++ b/discovery.php
@@ -117,6 +117,12 @@ while ($device = mysql_fetch_array($device_query)) {
     include("includes/discovery/bgp-peers.php"); 
     if ($device['type'] == "unknown") { $device['type'] = 'network'; } # FIXME: could also be a Netscreen...
   }
+  
+  if ($device['os'] == "linux")
+  {
+    # Also discover quagga peers
+    include("includes/discovery/bgp-peers.php");
+  }
 
   if($device['os'] == "ios" || $device['os'] == "iosxe" || $device['os'] == "catos" || $device['os'] == "asa" || $device['os'] == "pix") {
     include("includes/discovery/cisco-vlans.php");
diff --git a/includes/discovery/bgp-peers.php b/includes/discovery/bgp-peers.php
index 57ec0d5df..99c7ff195 100755
--- a/includes/discovery/bgp-peers.php
+++ b/includes/discovery/bgp-peers.php
@@ -1,6 +1,6 @@
 <?php
 
-### Discover BGP peers on Cisco and Juniper devices
+### Discover BGP peers
 
   echo("BGP Sessions : ");