diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 78e64c1509..3f86f3c929 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1896,7 +1896,7 @@ DEFUN (vtysh_show_debugging,
        DEBUG_STR)
 {
 	return show_per_daemon("do show debugging\n",
-			       "Debugging Information for %s:\n");
+			       "");
 }
 
 DEFUN (vtysh_show_debugging_hashtable,
diff --git a/watchfrr/watchfrr_vty.c b/watchfrr/watchfrr_vty.c
index 9cfdab44ab..fd9c017512 100644
--- a/watchfrr/watchfrr_vty.c
+++ b/watchfrr/watchfrr_vty.c
@@ -31,6 +31,16 @@
 pid_t integrated_write_pid;
 static int integrated_result_fd;
 
+DEFUN_NOSH(show_watchfrr_debugging,
+	   show_watchfrr_debugging_cmd,
+	   "show debugging [watchfrr]",
+	   SHOW_STR
+	   DEBUG_STR
+	   "WatchFRR\n")
+{
+	return CMD_SUCCESS;
+}
+
 DEFUN(config_write_integrated,
       config_write_integrated_cmd,
       "write integrated",
@@ -134,4 +144,5 @@ void watchfrr_vty_init(void)
 {
 	integrated_write_pid = -1;
 	install_element(ENABLE_NODE, &config_write_integrated_cmd);
+	install_element(ENABLE_NODE, &show_watchfrr_debugging_cmd);
 }
diff --git a/zebra/debug.c b/zebra/debug.c
index afeba1c6de..4ba8585f3e 100644
--- a/zebra/debug.c
+++ b/zebra/debug.c
@@ -83,6 +83,8 @@ DEFUN_NOSH (show_debugging_zebra,
 		vty_out(vty, "  Zebra next-hop tracking debugging is on\n");
 	if (IS_ZEBRA_DEBUG_MPLS)
 		vty_out(vty, "  Zebra MPLS debugging is on\n");
+	if (IS_ZEBRA_DEBUG_VXLAN)
+		vty_out(vty, "  Zebra VXLAN debugging is on\n");
 	if (IS_ZEBRA_DEBUG_PW)
 		vty_out(vty, "  Zebra pseudowire debugging is on\n");