diff --git a/Makefile b/Makefile
index c0b2ef7..3e566bb 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,11 @@ DBDIR=/tmp/DATA-dnsmanagerd
 run-dnsmanagerd:
 	$(Q)$(LD_P) ./bin/dnsmanagerd -v $(VERBOSITY) -r $(DBDIR)
 
+PORT ?= 8082
+ADDR ?=
+run-token-handler:
+	$(Q)$(LD_P) ./bin/token-handler $(PORT) $(ADDR)
+
 build-server:
 	$(Q)-$(SHOULD_UPDATE) bin/dnsmanagerd && shards build dnsmanagerd