diff --git a/ChangeLog b/ChangeLog
index df3e34f6b1de980251f8cc61163324d3f57807df..dc4c9a9aa7b18bcf2cf1634a16b4292b499618a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-23  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* TODO: Add entries for fixing limitations with pasting text and
+	handling bad/incomplete UTF-8 sequences.
+
 2007-04-22  David Lawrence Ramsey  <pooka109@gmail.com>
 
 	* text.c (backup_lines): Avoid a segfault when the mark begins
diff --git a/TODO b/TODO
index 1520e9ea2c53fb1a9725db45a93eb7366ace0b96..873251db79da8f5770b870afa8b7e98d817c4b76 100644
--- a/TODO
+++ b/TODO
@@ -35,6 +35,11 @@ For the next version:
   the center line, and M-' (M-") to go to the last line.
 - Allow searching for and replacing newlines.
 - Allow soft wrapping as well as hard wrapping?
+- Detect when we're pasting text, so that we can handle it differently
+  from normal typing?
+- Make pasting text work as fast as it does in Pico.
+- Fix handling of bad/incomplete UTF-8 sequences to display one Unicode
+  FFFD (Replacement Character) per sequence instead of one per byte.
 
 Old requests: