diff --git a/cumulus/etc/frr/daemons b/cumulus/etc/frr/daemons
index cf03cd9de1..91e2a0f5b6 100644
--- a/cumulus/etc/frr/daemons
+++ b/cumulus/etc/frr/daemons
@@ -28,4 +28,5 @@ ospf6d=no
 ripd=no
 ripngd=no
 isisd=no
-
+pimd=no
+ldpd=no
diff --git a/cumulus/etc/frr/debian.conf b/cumulus/etc/frr/debian.conf
index 8f3e1c1db6..a4945f39ae 100644
--- a/cumulus/etc/frr/debian.conf
+++ b/cumulus/etc/frr/debian.conf
@@ -12,6 +12,7 @@ ripd_options="   --daemon -A 127.0.0.1"
 ripngd_options=" --daemon -A ::1"
 isisd_options="  --daemon -A 127.0.0.1"
 pimd_options="  --daemon -A 127.0.0.1"
+ldpd_options="  --daemon -A 127.0.0.1"
 
 # The list of daemons to watch is automatically generated by the init script.
 watchfrr_enable=yes
diff --git a/lib/command.c b/lib/command.c
index 24272ccd1e..50976f2010 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1629,7 +1629,8 @@ DEFUN (show_commandtree,
        show_commandtree_cmd,
        "show commandtree [permutations]",
        SHOW_STR
-       "Show command tree\n")
+       "Show command tree\n"
+       "Permutations that we are interested in\n")
 {
   return cmd_list_cmds (vty, argc == 3);
 }
diff --git a/tools/frr b/tools/frr
index ba0b1a84c7..8524ab4083 100755
--- a/tools/frr
+++ b/tools/frr
@@ -21,7 +21,7 @@ V_PATH=/var/run/frr
 # Local Daemon selection may be done by using /etc/frr/daemons.
 # See /usr/share/doc/frr/README.Debian.gz for further information.
 # Keep zebra first and do not list watchfrr!
-DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd"
 MAX_INSTANCES=5
 RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py