diff --git a/buffet/main.cc b/buffet/main.cc
index 43ba4ab..cc2fea7 100644
--- a/buffet/main.cc
+++ b/buffet/main.cc
@@ -16,6 +16,7 @@
 #include <sysexits.h>
 
 #include "buffet/async_event_sequencer.h"
+#include "buffet/commands/command_manager.h"
 #include "buffet/dbus_constants.h"
 #include "buffet/exported_object_manager.h"
 #include "buffet/manager.h"
@@ -101,6 +102,9 @@
   // Release our handle on the sequencer so that it gets deleted after
   // both callbacks return.
   sequencer = nullptr;
+
+  buffet::CommandManager::Startup();
+
   LOG(INFO) << "Entering mainloop.";
   message_loop->Run();
 }