diff --git a/src/command.cpp b/src/command.cpp
index 3b8bb4577..bfb0dcc3f 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -52,6 +52,7 @@ std::string handleAdd ()
 {
   std::stringstream out;
 
+  context.task.set ("uuid", uuid ());
   context.task.setEntry ();
 
   // Recurring tasks get a special status.
diff --git a/src/main.cpp b/src/main.cpp
index 30fb7270d..b5e956cbf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include "Context.h"
+#include "../auto.h"
 
 Context context;