diff --git a/ChangeLog b/ChangeLog
index 0a2c03352..06c4930ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
  + Default .taskrc files are now largely empty, and rely almost completed
    on default values.
  + Fixed bug #433, making task command output more consistent.
+ + Fixed bug #434, allowing users to complete tasks with status 'waiting'
 
 ------ old releases ------------------------------
 
diff --git a/src/command.cpp b/src/command.cpp
index bafa381d1..2af1f16c7 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1321,7 +1321,7 @@ int handleDone (std::string &outs)
     bool nagged = false;
     foreach (task, tasks)
     {
-      if (task->getStatus () == Task::pending)
+      if ((task->getStatus () == Task::pending) || (task->getStatus () == Task::waiting))
       {
         Task before (*task);
 
@@ -1374,7 +1374,7 @@ int handleDone (std::string &outs)
             << task->id
             << " '"
             << task->get ("description")
-            << "' is not pending."
+            << "' is neither pending nor waiting."
             << std::endl;
         rc = 1;
     }