diff --git a/docs/TODO b/docs/TODO
index 30ebdc817..cd5d15ae0 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -6,6 +6,9 @@ Backlog (raw)
     - entropy server:
         - if local repo < remote repo, repo should be downloaded first
           then packages.
+        - do not use implicit pull when push is selected, block push if
+          local repo is older than remote, implement some kind of atomic
+          remote locking to guarantee mutual exclusion.
 
     - pkgcore spm plugin
         PF CATEGORY CFLAGS CXXFLAGS NEEDED FEATURES INHERITED are missing