diff --git a/xbps-src/TODO b/xbps-src/TODO
index 2a7c371599..b65199ffbd 100644
--- a/xbps-src/TODO
+++ b/xbps-src/TODO
@@ -9,3 +9,9 @@
   Explain extensively available variables, build phases, etc.
 
 - Fix packages with the "XXX" mark.
+
+- Make all packages use $homepage and $license. xbps-base-files installs
+  common license files into /usr/share/licenses, if any package uses any
+  other license not installed there, it should be installed into
+  /usr/share/licenses/$pkgname. Also $license should match the file names
+  available in /usr/share/licenses when using common licenses.