diff --git a/ChangeLog b/ChangeLog
index d6322ed5..17f5cdc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2014-08-23  James Youngman  <jay@gnu.org>
 
+	Remove obsolete TODO entries.
+	* TODO: remove BeOS multibyte entry (we fixed this by using the
+	gnulib wcwidth module; see https://savannah.gnu.org/bugs/?19979).
+	Remove comment about problems with gcc-2.95.2 on
+	sparc-sun-sunos4.1.3_U1; we'll look at the problem if anyone ever
+	complains that something doesn't work (though gnulib may in fact
+	no longer work on such an old platform in any case).
+	Remove some TODOs around locate performance; nobody's reported
+	performance issues, and we can examine any specific issues when
+	the arise.
+	Remove TODO about the largeness of depcomp; at 22KiB, it's much
+	smaller than this ChangeLog file, for example.
+
 	Remove obsolete TOLOWER/TOUPPER macros.
 	* locate/locate.c: The TOLOWER and TOUPPER macros are no longer
 	used.   Do not define them.
diff --git a/TODO b/TODO
index 7f556aa7..1953d838 100644
--- a/TODO
+++ b/TODO
@@ -1,16 +1,7 @@
 -*-outline-*-
-* -fstype core dumps on sparc-sun-sunos4.1.3_U1 with gcc-2.95.2
-This is on foxtrot.rahul.net.  dbx does not work on compiled find.
-Perhaps gcc is installed incorrectly.  "find / -fstype ufs" core dumps
-quickly.  cc works correctly.
-
-* Speed of locate without "-i" option needs to be increased.
-
 * Internationalization
 ** updatedb.sh should be internationalized
 
-* Eliminate unnecessary strcpy calls in xargs.
-
 * man pages for frcode, bigram, and code
 Perhaps a better description in texi pages as well.
 
@@ -25,13 +16,6 @@ my point is:
 - find may (in theory) sort incrementally very easily by sorting only the current
 directory entries before recursion
 
-
-* large file problems
-depcomp gets added by automake
-
-* BeOS problems with multibyte
-Bruno Haible reported problems with BeOS.
-
 * Include example of use of updatedb in documentation.
 Use something close to the Debian daily cron job.