diff --git a/Makefile b/Makefile
index 25c4c14..6396c99 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CXX=g++
 RM=rm -f
 SANCFLAGS=-fsanitize=address -fsanitize=leak
 SANLDFLAGS=-static-libasan -static-liblsan
-CFLAGS=$(SANCFLAGS) -fno-omit-frame-pointer -fPIC -std=gnu99 -g -Wall -Wextra -Werror-implicit-function-declaration -Wno-missing-field-initializers -I libwebsockets/include -I json-c
+CFLAGS=$(SANCFLAGS) -fno-omit-frame-pointer -fPIC -std=gnu99 -g -Wall -Wextra -Werror-implicit-function-declaration -Wno-missing-field-initializers -Ilibwebsockets/include -Ijson-c
 LDFLAGS=-shared -g $(SANCFLAGS) $(SANLDFLAGS)
 LDLIBS=-lgnutls
 
diff --git a/README.org b/README.org
index c3f1691..591fc7e 100644
--- a/README.org
+++ b/README.org
@@ -13,9 +13,9 @@
 [[https://travis-ci.org/bqv/weechat-slack][file:https://api.travis-ci.org/bqv/weechat-slack.svg?branch=master]]
 [[https://coveralls.io/github/bqv/weechat-slack?branch=master][file:https://coveralls.io/repos/github/bqv/weechat-slack/badge.svg?branch=master]]
 
- | Status:   | Under Development                 |
+ | Status:   | Under Development                   |
  | Location: | [[http://github.com/bqv/weechat-slack]] |
- | Version:  | 0.1.0                             |
+ | Version:  | 0.1.0                               |
 
 * Description
 
@@ -37,6 +37,27 @@
   make install
   #+end_src
 
+* Tasks
+
+** TODO [#A] Implement essential api endpoints and events
+  - [ ] Implement handling api message =message.me_message= (see [[http://github.com/bqv/weechat-slack/issues/5][#5]])
+  - [ ] Implement sending request =chat.meMessage= (see [[http://github.com/bqv/weechat-slack/issues/5][#5]])
+  - [ ] Implement handling api message =message.thread_broadcast=
+  - [X] Implement handling api message =message.bot_message= (see [[http://github.com/bqv/weechat-slack/issues/2][#2]])
+  - [ ] Implement handling api message =message.message_changed=
+  - [ ] Implement handling api message =message.message_deleted=
+  - [ ] Implement handling api message =message.message_replied=
+** TODO [#B] Implement completion engine
+  - [ ] Tab completion for slack emoji (see [[http://github.com/bqv/weechat-slack/issues/3][#3]])
+  - [ ] Tab completion for display/user names (see [[http://github.com/bqv/weechat-slack/issues/1][#1]])
+  - [ ] Sort nick-completion by recent (see [[http://github.com/bqv/weechat-slack/issues/4][#4]])
+** TODO [#B] Implement debian packaging
+  - [ ] Switch to system libwebsockets package (dynamically link)
+  - [ ] Create configure build step (cmake? autotools?)
+** TODO [#C] Implement remaining api endpoints and events
+  - [ ] Complete api endpoint set
+  - [ ] Complete api event set
+
 * Contributing
 
   *Your contributions are always welcome!*