diff --git a/TODO.md b/TODO.md
index 0a5ed15..aa1e0e4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -10,6 +10,8 @@ Add web interface for private messages.
 
 Add web interface for the list of people being followed.
 
+Implement hashtags.
+
 ## Wishlist and batshit crazy ideas
 
 The 'history' pages are now just monthly snapshots of the local timeline. This is ok and cheap and easy, but is problematic if you i.e. delete a post because it will be there in the history forever.