diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..6c5ff0f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+run:
+	go run main.go
+
+rundebug:
+	go run main.go -d
+
+build:
+	go build -o bin/wikingo
+
+clean:
+	rm -f bin/wikingo
diff --git a/TODO.md b/TODO.md
index 284ce37..788e3ac 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,8 +7,8 @@
 - [ ] Flag to show the version
 - [ ] Config file (to select store and some other future options)
 - [ ] Proper logger
-- [ ] Makefile helper
   - [ ] Reload if files changes [idea](https://medium.com/@olebedev/live-code-reloading-for-golang-web-projects-in-19-lines-8b2e8777b1ea#.gok9azrg4)
+- [x] Makefile helper
 - [ ] CI (gofmt, golint, more)?
 - [x] Page versioning in a really basic way