diff --git a/TODO b/TODO
deleted file mode 100644
index c53fc78..0000000
--- a/TODO
+++ /dev/null
@@ -1,26 +0,0 @@
--*- text -*-
-
-- ignore .overview when grepping Gnus folders			[X]
-- implement inverted matching 					[X]
-- (re)implement recursive search through directories		[X]
-- implement literal date matching				[ ]
-- write Texinfo documentation					[X]
-- implement writing selected messages to a new folder		[X]
-- implement deleting selected messages				[X]
-- add support for config files 					[ ]
-- add support for reading messages from stdin			[X]
-- add support for compressed mbox folders			[X]
-- make use of lockfile library					[ ]
-- make use of Solaris' maillock library				[ ]
-- provide possibility to use flock() instead of fcntl()		[X]
-- provide national language support with gettext()		[ ]
-- allow run-time selection of file locking method		[X]
-- make mboxgrep understand MIME					[ ]
-- enable removing duplicate messages w/ MD5 checksums		[X]
-- add checking for conflicting command-line options		[ ]
-- add support for GnuPG						[ ]
-- add support for bzip2 compression				[X]
-- add support for mail folder conversion			[ ]
-
-
-$Id: TODO,v 1.16 2003-04-06 21:48:23 dspiljar Exp $
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..f8a05fb
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,21 @@
+- [x] ignore .overview when grepping Gnus folders
+- [x] implement inverted matching
+- [x] re-implement recursive search through directories
+- [ ] implement literal date matching
+- [x] write Texinfo documentation
+- [x] implement writing selected messages to a new folder
+- [x] implement deleting selected messages
+- [ ] add support for config files
+- [x] add support for reading messages from stdin
+- [x] add support for compressed mbox folders
+- [ ] make use of lockfile library
+- [ ] make use of Solaris' maillock library
+- [x] provide possibility to use flock() instead of fcntl()
+- [ ] provide national language support with gettext()
+- [x] allow run-time selection of file locking method
+- [ ] make mboxgrep understand MIME
+- [x] enable removing duplicate messages w/ MD5 checksums
+- [ ] add checking for conflicting command-line options
+- [ ] add support for GnuPG
+- [x] add support for bzip2 compression
+- [ ] add support for mail folder conversion