diff --git a/ProjectCode/ConfigFiles/NetworkDiscovery/lldpd b/ProjectCode/ConfigFiles/NetworkDiscovery/lldpd
new file mode 100644
index 0000000..f44c8a0
--- /dev/null
+++ b/ProjectCode/ConfigFiles/NetworkDiscovery/lldpd
@@ -0,0 +1,2 @@
+# Uncomment to start SNMP subagent and enable CDP, SONMP and EDP protocol
+DAEMON_ARGS="-x -c -s -e"
\ No newline at end of file
diff --git a/ProjectCode/ConfigFiles/SNMP/snmpd-physicalhost.conf b/ProjectCode/ConfigFiles/SNMP/snmpd-physicalhost.conf
index 5acf721..20885f3 100644
--- a/ProjectCode/ConfigFiles/SNMP/snmpd-physicalhost.conf
+++ b/ProjectCode/ConfigFiles/SNMP/snmpd-physicalhost.conf
@@ -41,3 +41,6 @@ pass_persist    .1.3.6.1.4.1.9.9.13.1.3 /usr/local/bin/temper-snmp
 
 # Allow Systems Management Data Engine SNMP to connect to snmpd using SMUX
 # smuxpeer .1.3.6.1.4.1.674.10892.1
+
+# LLDP collection
+master agentx
\ No newline at end of file
diff --git a/ProjectCode/ConfigFiles/SNMP/snmpd-rpi.conf b/ProjectCode/ConfigFiles/SNMP/snmpd-rpi.conf
index dfda656..b74049d 100644
--- a/ProjectCode/ConfigFiles/SNMP/snmpd-rpi.conf
+++ b/ProjectCode/ConfigFiles/SNMP/snmpd-rpi.conf
@@ -35,3 +35,6 @@ extend serial /usr/bin/sudo /usr/bin/cat /sys/firmware/devicetree/base/serial-nu
 
 # Allow Systems Management Data Engine SNMP to connect to snmpd using SMUX
 # smuxpeer .1.3.6.1.4.1.674.10892.1
+
+# LLDP collection
+master agentx
\ No newline at end of file
diff --git a/ProjectCode/ConfigFiles/SNMP/snmpd.conf b/ProjectCode/ConfigFiles/SNMP/snmpd.conf
index c707a7b..ef6dd9d 100644
--- a/ProjectCode/ConfigFiles/SNMP/snmpd.conf
+++ b/ProjectCode/ConfigFiles/SNMP/snmpd.conf
@@ -38,4 +38,7 @@ extend hardware /usr/bin/sudo /usr/bin/cat /sys/devices/virtual/dmi/id/product_n
 extend serial /usr/bin/sudo /usr/bin/cat /sys/devices/virtual/dmi/id/product_serial
 
 # Allow Systems Management Data Engine SNMP to connect to snmpd using SMUX
-# smuxpeer .1.3.6.1.4.1.674.10892.1
\ No newline at end of file
+# smuxpeer .1.3.6.1.4.1.674.10892.1
+
+# LLDP collection
+master agentx
\ No newline at end of file
diff --git a/ProjectCode/SetupNewSystem.sh b/ProjectCode/SetupNewSystem.sh
index 5c1907a..dba43f2 100644
--- a/ProjectCode/SetupNewSystem.sh
+++ b/ProjectCode/SetupNewSystem.sh
@@ -248,6 +248,9 @@ function global-postPackageConfiguration() {
 
   systemctl daemon-reload && systemctl restart snmpd && /etc/init.d/snmpd restart
 
+  cat ./ConfigFiles/NetworkDiscovery/lldpd > /etc/default/lldpd 
+  systemct restart lldpd
+
   systemctl stop rsyslog
   systemctl start rsyslog