diff --git a/src/DOM.cpp b/src/DOM.cpp
index 4cfa01a9a..b88c04894 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -331,7 +331,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
     }
 
     // Special handling of status required for virtual waiting status
-    // implementation
+    // implementation. Remove in 3.0.0.
     if (ref.data.size () && size == 1 && canonical == "status")
     {
       value = Variant (ref.statusToText (ref.getStatus ()));
diff --git a/src/Task.cpp b/src/Task.cpp
index 60d898920..4a7a63741 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -305,8 +305,9 @@ Task::status Task::getStatus () const
 
   auto status = textToStatus (get ("status"));
 
-  // implement the "virtual" Task::waiting status, which is not stored on-disk
+  // Implement the "virtual" Task::waiting status, which is not stored on-disk
   // but is defined as a pending task with a `wait` attribute in the future.
+  // This is workaround for 2.6.0, remove in 3.0.0.
   if (status == Task::pending && is_waiting ()) {
       return Task::waiting;
   }