diff --git a/NEWS b/NEWS
index aa3ba4c5..0d6b0e6a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 xbps-0.18 (???):
 
+ * New utilities replacing xbps-bin(8) and xbps-repo(8):
+
+	- xbps-install(8): to install and update packages.
+	- xps-pkgdb(8): to report and fix errors in pkgdb.
+	- xbps-query(8): to query packages and/or repositories.
+	- xbps-reconfigure(8): to (re)configure packages.
+	- xbps-remove(8): to remove packages.
+	- xbps-rindex(8): to handle local repositories.
+
  * While reconfiguring packages do not flush pkgdb unless it's necessary.
 
  * While unpacking files from binpkg also check if any symlink has been
diff --git a/TODO b/TODO
index e451c4a9..656db01a 100644
--- a/TODO
+++ b/TODO
@@ -3,22 +3,15 @@ libxbps:
    modified files from target pkg.
  - properties: (update-first) still unimplemented.
 
-xbps-bin:
- - Improve help output and add description at the same line than target.
-
 xbps-create:
  - Move all configuration files to <prefix>/share/<pkgname>/conf/<cffile>.
  - Add -i --installed option to create binpkg from an installed version.
 
-xbps-repo:
- - Improve help output and add description at the same line than target.
+All:
  - Add support to sign with PGP or RSA the repository index files.
  - Add requiredby support to pkg's dictionaries in repository's index,
    to know reverse deps from remote repos.
 
-All:
- - Maybe merge xbps-bin(8) and xbps-repo(8) onto xbps(8).
-
 Issues listed at http://code.google.com/p/xbps/issues/list
 
 Surely more stuff...