diff --git a/net/haproxy/+POST_DEINSTALL b/net/haproxy/+POST_DEINSTALL
new file mode 100644
index 000000000..fa55fa709
--- /dev/null
+++ b/net/haproxy/+POST_DEINSTALL
@@ -0,0 +1,3 @@
+# remove legacy components on uninstall
+rm -f /usr/local/www/diag_logs_haproxy.php
+rm -f /usr/local/etc/inc/plugins.inc.d/haproxy.inc
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
index 5e04f9d37..d91b7c8ed 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
@@ -22,7 +22,7 @@
               <Counters VisibleName="Counters" url="/ui/haproxy/statistics/#counters"/>
               <StickTables VisibleName="Stick Tables" url="/ui/haproxy/statistics/#tables"/>
           </Statistics>
-          <!-- <Log VisibleName="Log File" order="30" url="/diag_logs_haproxy.php"/> -->
+          <Log VisibleName="Log File" order="30" url="/diag_logs_haproxy.php"/>
       </HAProxy>
     </Services>
 </menu>
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS
index 82cf9aac2..fee417f6f 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS
@@ -1,3 +1,4 @@
+diag_logs_haproxy.php:/usr/local/www/diag_logs_haproxy.php
 haproxy.conf:/usr/local/etc/haproxy.conf
 haproxy.inc:/usr/local/etc/inc/plugins.inc.d/haproxy.inc
 rc.conf.d:/etc/rc.conf.d/haproxy
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/diag_logs_haproxy.php b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/diag_logs_haproxy.php
new file mode 100644
index 000000000..dfd8a441c
--- /dev/null
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/diag_logs_haproxy.php
@@ -0,0 +1,6 @@
+<?php
+
+$logfile = '/var/log/haproxy.log';
+$logclog = true;
+
+require_once 'diag_logs_template.inc';