diff --git a/make-linux.mk b/make-linux.mk
index 9fd4f7b9..a7eb7f6a 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -45,6 +45,12 @@ endif
 # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
 ONE_OBJS+=ext/http-parser/http_parser.o
 
+ifeq ($(ZT_CONTROLLER),1)
+	#LIBS+=-lpq -lrabbitmq
+	#DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER
+	override DEFS+=-DZT_CONTROLLER
+endif
+
 # Build with address sanitization library for advanced debugging (clang)
 ifeq ($(ZT_SANITIZE),1)
 	DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
@@ -331,6 +337,9 @@ official:	FORCE
 docker:	FORCE
 	docker build -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized .
 
+controller-node:	FORCE
+	make DEFS+="-DZT_CONTROLLER" one
+
 central-controller:	FORCE
 	make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq -Lext/librabbitmq/centos_x64/lib/ -lrabbitmq" CXXFLAGS="-I/usr/pgsql-10/include -I./ext/librabbitmq/centos_x64/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one