diff --git a/Makefile.am b/Makefile.am
index 77885a363..4f472ba3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -673,7 +673,7 @@ endif
 #
 
 man_MANS = doc/mpd.1 doc/mpd.conf.5
-doc_DATA = AUTHORS COPYING NEWS README TODO UPGRADING doc/mpdconf.example
+doc_DATA = AUTHORS COPYING NEWS README UPGRADING doc/mpdconf.example
 
 if ENABLE_DOCUMENTATION
 protocoldir = $(docdir)/protocol
diff --git a/TODO b/TODO
deleted file mode 100644
index 615514cbd..000000000
--- a/TODO
+++ /dev/null
@@ -1,86 +0,0 @@
-0.14
-----
-
-*) data structures
-	*) remove changes made to linked list for TagTracker
-
-*) input plugins
-	*) add support for playing aac streams
-
-*) Add support for 24-bit audio
-
-*) cleanup linked list code!
-
-*) add error codes for status->error
-
-*) Cleanup Config File Code
-
-*) audio output
-	*) allowing "pausing" of audio output devices
-	*) while pausing, play silence for the devices that don't support
-	   "pausing"
-	*) more accurate time reporting by determining how much of audio_device
-                buffer has been played
-
-*) state
-	*) abstract out state code from playlist.c
-	*) put MPD Version in statefile
-
-*) add playlistreplace command (replace current playlist with saved playlist
-                                and keep playing)
-
-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
----
-
-*) bug fixes
-
-post-1.0
---------
-
-*) rewrite audio pipe
-	*) use pthreads/clone
-		*) try to constrain the use of pthread mutex's and condition's
-			to specific output plugins
-	*) use pull model for audio_output
-	*) threads
-		0) managing thread
-			*) receives commands
-			*) manages state
-			*) handles time/metadata sending
-		1) decoding thread
-		2) effects thread
-			*) crossfading
-			*) *command* resampling/conversions
-		3) audio_output thread
-			*) thread for each audio_output device
-
-*) dynamic metadata
-	*) implement by recording the ftell positions of entries
-	*) buffer changes and flush them once every 60 seconds
-	*) buffer changes while doing an update
-	*) be sure to check that the metadata "header" is what we expect
-	   before writing at the position
-	*) add support for:
-		*) last time played
-		*) times played
-		*) times skipped
-		*) ranking