diff --git a/TODO b/TODO
index 58b690a7ef0..cfc08cde377 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,8 @@
-* Autodetect extract suffix for files with version numbers like 0.10.21 (gstreamer)
-  - extract suffix is ignored in pkg desc (should be allow it?)
+Some stuff that should be done:
+
+* Personalized scripts per template to unpack distfiles.
+* Multiple URLs to download source distribution files, aliases, etc.
+  Something like ${sourceforget} to pick up any specified mirror.
+* More robust and fast dependency checking.
 * wget now is required inside the chroot
   - etc/resolv.conf is copied before entering the chroot
diff --git a/xbps.sh b/xbps.sh
index b5fca88b6b2..5503f1fc716 100755
--- a/xbps.sh
+++ b/xbps.sh
@@ -27,11 +27,6 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #-
 #
-# TODO
-#	- Personalized scripts per template to unpack distfiles.
-#	- Multiple URLs to download source distribution files, aliases, etc.
-#	- More robust and fast dependency checking.
-#
 # Default path to configuration file, can be overriden
 # via the environment or command line.
 #