diff --git a/Documentation/TODO b/Documentation/TODO
index 98fcf3eb8..cd4c235fd 100644
--- a/Documentation/TODO
+++ b/Documentation/TODO
@@ -1,6 +1,13 @@
 
  Note that items with (!) have high priority.
 
+libblkid
+--------
+  - (!) don't use fixed set of the static buffers for TAGs in blkid_probe,
+    allocate all on the fly. It seems that for example btrfs is crazy enough
+    to have LABELs longer than we have bufferes in libblkid
+    https://bugzilla.redhat.com/show_bug.cgi?id=1164708
+
 agetty
 -----
   - support default issue (/etc/issue) output for agetty to make it agetty