diff --git a/ChangeLog b/ChangeLog
index e24b05a90..dc5a7d3ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
  + autoconf eliminated.
  + Corrected sorting to use std::stable_sort instead of std::sort, which is not
    guaranteed stable (thanks to Stefan Hacker).
+ + Added feature #700, which adds tab-completion of built-in tags.
 
 ------ old releases ------------------------------
 
diff --git a/src/command.cpp b/src/command.cpp
index bd47ad98d..4ba1ea6a0 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -469,7 +469,7 @@ int handleCompletionTags (std::string& outs)
   context.tdb.commit ();
   context.tdb.unlock ();
 
-  // Scan all the tasks for their project name, building a map using project
+  // Scan all the tasks for their tags, building a map using tag
   // names as keys.
   std::map <std::string, int> unique;
   foreach (t, tasks)
@@ -481,6 +481,14 @@ int handleCompletionTags (std::string& outs)
       unique[*tag] = 0;
   }
 
+  // add built-in tags to map
+  unique["nocolor"] = 0;
+  unique["nonag"]   = 0;
+  unique["nocal"]   = 0;
+  unique["next"]    = 0;
+  unique["stall"]   = 0;
+  unique["someday"] = 0;
+
   std::stringstream out;
   foreach (tag, unique)
     out << tag->first << "\n";