diff --git a/debian/frr-pythontools.install b/debian/frr-pythontools.install
index 28140382f6..5f7eaebed5 100644
--- a/debian/frr-pythontools.install
+++ b/debian/frr-pythontools.install
@@ -1 +1,2 @@
 usr/lib/frr/frr-reload.py
+usr/lib/frr/generate_support_bundle.py
diff --git a/debian/rules b/debian/rules
index a546f38d70..c8550ecb52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,6 +71,7 @@ override_dh_auto_install:
 	dh_auto_install
 
 	sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/frr-reload.py
+	sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/generate_support_bundle.py
 
 # let dh_systemd_* and dh_installinit do their thing automatically
 ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index fa0a6d8a0a..b3f9ac7630 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -656,6 +656,9 @@ fi
 
 
 %files pythontools
+%{_sbindir}/generate_support_bundle.py
+%{_sbindir}/generate_support_bundle.pyc
+%{_sbindir}/generate_support_bundle.pyo
 %{_sbindir}/frr-reload.py
 %{_sbindir}/frr-reload.pyc
 %{_sbindir}/frr-reload.pyo
diff --git a/tools/etc/frr/support_bundle_commands.conf b/tools/etc/frr/support_bundle_commands.conf
index d52824ff07..8845df5fc7 100644
--- a/tools/etc/frr/support_bundle_commands.conf
+++ b/tools/etc/frr/support_bundle_commands.conf
@@ -28,6 +28,7 @@ show bgp ipv6 update-groups advertised-routes
 show bgp ipv6 update-groups packet-queue
 show bgp ipv6 update-groups statistics
 show ip bgp statistics
+show bgp martian next-hop
 
 show bgp evpn route
 CMD_LIST_END
@@ -37,14 +38,17 @@ PROC_NAME:zebra
 CMD_LIST_START
 show zebra
 show zebra client summary
-show ip route
-
+show ip zebra route dump json
+show ipv6 zebra route dump json
+show ip nht vrf all
 show route-map
 show memory
-show interface
+show interface vrf all
 show vrf
+show zebra fpm stats
 show error all
 show work-queues
+show debugging hashtable
 show running-config
 show thread cpu
 show thread poll
diff --git a/tools/generate_support_bundle.py b/tools/generate_support_bundle.py
old mode 100644
new mode 100755
index 118ca113a5..c9ca9c3d0d
--- a/tools/generate_support_bundle.py
+++ b/tools/generate_support_bundle.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 ########################################################
 ### Python Script to generate the FRR support bundle ###
 ########################################################
diff --git a/tools/subdir.am b/tools/subdir.am
index 7713bb1ade..c637db6eb1 100644
--- a/tools/subdir.am
+++ b/tools/subdir.am
@@ -16,6 +16,7 @@ sbin_SCRIPTS += \
 	\
 	tools/frrcommon.sh \
 	tools/frrinit.sh \
+	tools/generate_support_bundle.py \
 	tools/watchfrr.sh \
 	# end
 
@@ -35,6 +36,7 @@ EXTRA_DIST += \
 	tools/frr-reload \
 	tools/frr-reload.py \
 	tools/frr.service \
+	tools/generate_support_bundle.py \
 	tools/multiple-bgpd.sh \
 	tools/rrcheck.pl \
 	tools/rrlookup.pl \