2 files changed, 16 insertions, 6 deletions
diff --git a/README b/README
index b62fc0c..d36bc02 100644
--- a/README
+++ b/README
@@ -63,9 +63,3 @@ Versions
 * 0.1.2 (2018-03-11)
   - First usable version for broader testing
 
-TODO
-----
-* Merge new users/groups
-* Interactively merge updated /etc files
-  (borrow OpenBSD's sysmerge(8) or improve/simplify mergemaster(8))
-* rcs(1) controlled /etc upgrade
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..5e06b55
--- /dev/null
+++ b/TODO
@@ -0,0 +1,16 @@
+* PATH: use tools from the new system
+* Merge new users/groups
+* Interactively merge updated /etc files
+  (borrow OpenBSD's sysmerge(8) or improve/simplify mergemaster(8))
+* rcs(1) controlled /etc upgrade
+
+[rcs-etc]
+* rcs + vendor branch: to manage /etc and support 3-way merge to update
+  the files
+* etc-upgrade can be interrupted/paused and then resumed
+* generate a detailed report for the upgrade, something like a git commit
+* display the report and let user to make sure the upgrade is correct
+* send the report as an email to root
+
+* trap signal; clean up on error
+* lock/status file to be safe ...