diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile
index 49a72a38..868bad6a 100644
--- a/bacnet-stack/Makefile
+++ b/bacnet-stack/Makefile
@@ -75,6 +75,9 @@ library:
 demos:
 	$(MAKE) -C demo all
 
+router:
+	$(MAKE) -C demo router
+
 # Add "ports" to the build, if desired
 ports:	atmega168 bdk-atxx4-mstp at91sam7s
 	@echo "Built the ARM7 and AVR ports"
@@ -91,3 +94,4 @@ bdk-atxx4-mstp: ports/bdk-atxx4-mstp/Makefile
 clean:
 	$(MAKE) -C lib clean
 	$(MAKE) -C demo clean
+	$(MAKE) -C demo/router clean
diff --git a/bacnet-stack/demo/Makefile b/bacnet-stack/demo/Makefile
index 83b82dd0..b29db1ed 100644
--- a/bacnet-stack/demo/Makefile
+++ b/bacnet-stack/demo/Makefile
@@ -49,9 +49,9 @@ SUBDIRS = readprop writeprop readfile writefile reinit server dcc \
 	whohas whois ucov scov timesync epics readpropm \
 	mstpcap mstpcrc uptransfer \
 	whoisrouter iamrouter initrouter
-ifeq (${BACNET_PORT},linux)
-SUBDIRS += router
-endif
+#ifeq (${BACNET_PORT},linux)
+#SUBDIRS += router
+#endif
 
 ifeq (${BACNET_PORT},win32)
 SUBDIRS += ptransfer
@@ -61,9 +61,14 @@ ifneq (,$(findstring -DBAC_ROUTING,$(BACNET_DEFINES)))
 	SUBDIRS += gateway
 endif
 
+.PHONY : all router clean
+
 TARGETS = all clean
 
 $(TARGETS): %: $(patsubst %, %.%, $(SUBDIRS))
 
 $(foreach TGT, $(TARGETS), $(patsubst %, %.$(TGT), $(SUBDIRS))):
 	$(MAKE) -b -C $(subst ., , $@)
+
+router:
+	$(MAKE) -b -C router