diff --git a/ChangeLog b/ChangeLog
index 0b3e2c008..4351c2ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,9 @@
  + Fixed bug #402 which failed compilation on Arch Linux (thanks to
    Johannes Schlatow).
  + Fixed bug #401 that ignored the search.case.sensitive configuration
-   setting when filtering on project names (thank to John Florian).
+   setting when filtering on project names (thanks to John Florian).
+ + Fixed bug #395 that prevented the upgrade of a pending task to a
+   recurring task (thanks to T. Charles Yun).
 
 ------ old releases ------------------------------
 
diff --git a/src/command.cpp b/src/command.cpp
index 627ac1f3f..6609aac5b 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1359,6 +1359,21 @@ int handleModify (std::string &outs)
         // A non-zero value forces a file write.
         int changes = 0;
 
+        // If a task is being made recurring, there are other cascading
+        // changes.
+        if (!task->has ("recur") &&
+            context.task.has ("recur"))
+        {
+          other->setStatus (Task::recurring);
+          other->set ("mask", "");
+          ++changes;
+
+          std::cout << "Task "
+                    << other->id
+                    << " is now a recurring task."
+                    << std::endl;
+        }
+
         // Apply other deltas.
         if (deltaDescription (*other))
         {