diff --git a/discovery.php b/discovery.php
index 7575b80fc..adcea3dcd 100755
--- a/discovery.php
+++ b/discovery.php
@@ -89,26 +89,26 @@ while ($device = mysql_fetch_array($device_query))
   #include("includes/discovery/os.inc.php");
 
   ## Discover Interfaces 
-  include("includes/discovery/ports.php");
+  include("includes/discovery/ports.inc.php");
 
   ## Discovery ENTITY-MIB 
-#  include("includes/discovery/entity-physical.inc.php");
+  #include("includes/discovery/entity-physical.inc.php");
 
   include("includes/discovery/processors.inc.php");
 
   ## Discover IPv4 Addresses
-  include("includes/discovery/ipv4-addresses.php");
+  include("includes/discovery/ipv4-addresses.inc.php");
 
   ## Discovery IPv6 Addresses
-  include("includes/discovery/ipv6-addresses.php");
+  include("includes/discovery/ipv6-addresses.inc.php");
 
   ## Discover Temperatures/Voltages/Fanspeeds
-  include("includes/discovery/temperatures.php");
-  include("includes/discovery/voltages.php");
-  include("includes/discovery/fanspeeds.php");
+  include("includes/discovery/temperatures.inc.php");
+  include("includes/discovery/voltages.inc.php");
+  include("includes/discovery/fanspeeds.inc.php");
 
   ## Discover Storage
-  include("includes/discovery/storage.php");
+  include("includes/discovery/storage.inc.php");
 
   ## hr-device.inc.php
   include("includes/discovery/hr-device.inc.php");
@@ -117,44 +117,38 @@ while ($device = mysql_fetch_array($device_query))
   include("includes/discovery/discovery-protocols.inc.php");
 
   ## ARP Table
-  include("includes/discovery/arp-table.php");
+  include("includes/discovery/arp-table.inc.php");
 
   if($device['os'] == "screenos") { 
     if ($device['type'] == "unknown") { $device['type'] = 'firewall'; }
   }
 
+  ## BGP Peers (Quagga, Cisco, Juniper, Foundry)
+  include("includes/discovery/bgp-peers.inc.php");
+
   if($device['os'] == "junos") { 
-    include("includes/discovery/bgp-peers.php"); 
     if ($device['type'] == "unknown") { $device['type'] = 'network'; } # FIXME: could also be a Netscreen...
   }
   
   if($device['os'] == "junose") { 
-    include("includes/discovery/bgp-peers.php"); 
     include("includes/discovery/processors-junose.inc.php");
   }
   
-  if ($device['os_group'] == "unix")
-  {
-    # 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");
-    include("includes/discovery/bgp-peers.php");
-    include("includes/discovery/cisco-mac-accounting.php");
-    include("includes/discovery/cisco-pw.php");
-    include("includes/discovery/cisco-vrf.php");
+    include("includes/discovery/cisco-vlans.inc.php");
+    include("includes/discovery/cisco-mac-accounting.inc.php");
+    include("includes/discovery/cisco-pw.inc.php");
+    include("includes/discovery/cisco-vrf.inc.php");
     #include("includes/discovery/cisco-processors.php");
-    include("includes/discovery/cemp-mib.php");
-    include("includes/discovery/cmp-mib.php");
+    include("includes/discovery/cemp-mib.inc.php");
+    include("includes/discovery/cmp-mib.inc.php");
 
     if ($device['type'] == "unknown") { $device['type'] = 'network'; };
   }
 
   if ($device['os'] == "procurve" || $device['os'] == "powerconnect")
   {
-    include("includes/discovery/q-bridge-mib.php");
+    include("includes/discovery/q-bridge-mib.inc.php");
     if ($device['type'] == "unknown") { $device['type'] = 'network'; };
   }
 
diff --git a/includes/discovery/arp-table.php b/includes/discovery/arp-table.inc.php
similarity index 100%
rename from includes/discovery/arp-table.php
rename to includes/discovery/arp-table.inc.php
diff --git a/includes/discovery/bgp-peers.php b/includes/discovery/bgp-peers.inc.php
similarity index 100%
rename from includes/discovery/bgp-peers.php
rename to includes/discovery/bgp-peers.inc.php
diff --git a/includes/discovery/cemp-mib.php b/includes/discovery/cemp-mib.inc.php
similarity index 100%
rename from includes/discovery/cemp-mib.php
rename to includes/discovery/cemp-mib.inc.php
diff --git a/includes/discovery/cisco-mac-accounting.php b/includes/discovery/cisco-mac-accounting.inc.php
similarity index 100%
rename from includes/discovery/cisco-mac-accounting.php
rename to includes/discovery/cisco-mac-accounting.inc.php
diff --git a/includes/discovery/cisco-processors.php b/includes/discovery/cisco-processors.inc.php
similarity index 100%
rename from includes/discovery/cisco-processors.php
rename to includes/discovery/cisco-processors.inc.php
diff --git a/includes/discovery/cisco-pw.php b/includes/discovery/cisco-pw.inc.php
similarity index 100%
rename from includes/discovery/cisco-pw.php
rename to includes/discovery/cisco-pw.inc.php
diff --git a/includes/discovery/cisco-vlans.php b/includes/discovery/cisco-vlans.inc.php
similarity index 100%
rename from includes/discovery/cisco-vlans.php
rename to includes/discovery/cisco-vlans.inc.php
diff --git a/includes/discovery/cisco-vrf.php b/includes/discovery/cisco-vrf.inc.php
similarity index 100%
rename from includes/discovery/cisco-vrf.php
rename to includes/discovery/cisco-vrf.inc.php
diff --git a/includes/discovery/cmp-mib.php b/includes/discovery/cmp-mib.inc.php
similarity index 100%
rename from includes/discovery/cmp-mib.php
rename to includes/discovery/cmp-mib.inc.php
diff --git a/includes/discovery/fanspeeds.php b/includes/discovery/fanspeeds.inc.php
similarity index 100%
rename from includes/discovery/fanspeeds.php
rename to includes/discovery/fanspeeds.inc.php
diff --git a/includes/discovery/ipv4-addresses.php b/includes/discovery/ipv4-addresses.inc.php
similarity index 100%
rename from includes/discovery/ipv4-addresses.php
rename to includes/discovery/ipv4-addresses.inc.php
diff --git a/includes/discovery/ipv6-addresses.php b/includes/discovery/ipv6-addresses.inc.php
similarity index 100%
rename from includes/discovery/ipv6-addresses.php
rename to includes/discovery/ipv6-addresses.inc.php
diff --git a/includes/discovery/interfaces.php b/includes/discovery/ports.inc.php
similarity index 99%
rename from includes/discovery/interfaces.php
rename to includes/discovery/ports.inc.php
index 1e8517d27..951930e66 100755
--- a/includes/discovery/interfaces.php
+++ b/includes/discovery/ports.inc.php
@@ -2,7 +2,7 @@
 
 # Discover ports
 
-  echo("Interfaces : ");
+  echo("Ports : ");
 
   $ports = snmp_walk($device, "ifDescr", "-Onsq", "IF-MIB");
 
diff --git a/includes/discovery/q-bridge-mib.php b/includes/discovery/q-bridge-mib.inc.php
similarity index 100%
rename from includes/discovery/q-bridge-mib.php
rename to includes/discovery/q-bridge-mib.inc.php
diff --git a/includes/discovery/storage.php b/includes/discovery/storage.inc.php
similarity index 100%
rename from includes/discovery/storage.php
rename to includes/discovery/storage.inc.php
diff --git a/includes/discovery/temperatures-adva.php b/includes/discovery/temperatures-adva.inc.php
similarity index 100%
rename from includes/discovery/temperatures-adva.php
rename to includes/discovery/temperatures-adva.inc.php
diff --git a/includes/discovery/temperatures.php b/includes/discovery/temperatures.inc.php
similarity index 100%
rename from includes/discovery/temperatures.php
rename to includes/discovery/temperatures.inc.php
diff --git a/includes/discovery/voltages.php b/includes/discovery/voltages.inc.php
similarity index 100%
rename from includes/discovery/voltages.php
rename to includes/discovery/voltages.inc.php