diff --git a/README.md b/README.md
index fbccfce..566c06e 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,10 @@
 - ux: stage changes in on-disk repo before pushing to remote git
 - admin: allow configuration of remote/local git
 - admin: read passwords from remote git + tool for writing these passwords
-- fix: Return proper Etags as soon as opium supports Lwt.t etags
 - speed: incremental import / do not re-encode images
 - ux: confirmation before deletion of images/posts
+- fix: Return proper Etags as soon as opium supports Lwt.t etags
+  https://github.com/rgrinberg/opium/issues/265
 
 # Image strategy proposal
 
diff --git a/src/brainstorm.ml b/src/brainstorm.ml
index 6854ceb..9a193f3 100644
--- a/src/brainstorm.ml
+++ b/src/brainstorm.ml
@@ -535,6 +535,7 @@ let () =
     and etag_of_fname _fname =
       (* TODO: Open issue/PR regarding Lwt.t return type.
        * Derive etag from file modification date
+       * https://github.com/rgrinberg/opium/issues/265
        *)
       Some etag
     in Middleware.static_unix ~local_path ~etag_of_fname ())
@@ -628,6 +629,7 @@ let () =
         and uri_prefix = Location.category category
         and etag_of_fname fname =
           (* TODO: open Issue/PR to for [string option Lwt.t] return value
+           * https://github.com/rgrinberg/opium/issues/265
           match parse fname with
           | None -> Lwt.return_none
           | Some (key, file) ->