diff --git a/ChangeLog b/ChangeLog
index ea5ad6196..a70a27594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ ver 0.14.0 (????/??/??)
 * New FIFO audio output
 * Support for WavPack files
 * Support for reading ReplayGain from LAME tags on MP3s
+* addid takes optional second argument to specify position
 
 ver 0.13.0 (2007/5/28)
 * New JACK audio output
diff --git a/TODO b/TODO
index f652d4ff4..615514cbd 100644
--- a/TODO
+++ b/TODO
@@ -7,32 +7,18 @@
 *) input plugins
 	*) add support for playing aac streams
 
-*) mixer
-	*) add sun support
-	*) add OS X support
-
 *) Add support for 24-bit audio
 
 *) cleanup linked list code!
 
-*) implement listener socket protocol as documented here:
-	http://mpd.wikia.com/wiki/MusicPlayerDaemonListenerProtocol
-
-*) support for dynamically loading plugins
-	*) cleanup input plugins "API"
-	*) cleanup output plugins "API"
-
 *) add error codes for status->error
 
 *) Cleanup Config File Code
 
 *) audio output
-	*) write a esd native audioOutput
-	*) write a nas native audioOutput
 	*) allowing "pausing" of audio output devices
-	*) while pausing, play silence for the devices that don't support 
+	*) while pausing, play silence for the devices that don't support
 	   "pausing"
-	*) write a sun native audioOutput
 	*) more accurate time reporting by determining how much of audio_device
                 buffer has been played
 
@@ -43,7 +29,24 @@
 *) add playlistreplace command (replace current playlist with saved playlist
                                 and keep playing)
 
-*) add command for inserting songs in a specific position
+0.15.0
+------
+*) support for dynamically loading plugins
+	*) cleanup input plugins "API"
+	*) cleanup output plugins "API"
+
+*) implement listener socket protocol as documented here:
+	http://mpd.wikia.com/wiki/MusicPlayerDaemonListenerProtocol
+
+
+???
+---
+*) mixer
+	*) add sun support
+	*) add OS X support
+*) audio output
+	*) write a nas native audioOutput
+	*) write a sun native audioOutput
 
 1.0
 ---