diff --git a/TODO b/TODO
index 15cdb271..fe7fb9a6 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,7 @@
+ - @ in netjoins doent show up
+ - change paste detection not to get on without linefeed
+ - escape_char broken?
+
  - /whowas server nick doesn't work
 01:18 <@darix> cras: /foreach server /disconnect $tag n8 <-- doesnt work
  - /hilight -priority is broken
diff --git a/configure.in b/configure.in
index fe6a9998..e486b834 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ if test -n "`grep '^#undef VERSION' config.h.in`"; then
 fi
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(irssi, 0.8.6.CVS)
+AM_INIT_AUTOMAKE(irssi, 0.8.7)
 
 AM_MAINTAINER_MODE