diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile
index e6c864ef..f6b5628b 100644
--- a/bacnet-stack/Makefile
+++ b/bacnet-stack/Makefile
@@ -77,6 +77,9 @@ server:
 mstpcap:
 	$(MAKE) -B -C demo mstpcap
 
+mstpcrc: library
+	$(MAKE) -B -C demo mstpcrc
+
 iam:
 	$(MAKE) -B -C demo iam
 
@@ -89,8 +92,7 @@ abort:
 error:
 	$(MAKE) -B -C demo error
 
-router:
-	$(MAKE) -s -C lib all
+router: library
 	$(MAKE) -s -C demo router
 
 # Add "ports" to the build, if desired
diff --git a/bacnet-stack/demo/Makefile b/bacnet-stack/demo/Makefile
index 6129963a..e952d58a 100644
--- a/bacnet-stack/demo/Makefile
+++ b/bacnet-stack/demo/Makefile
@@ -92,6 +92,9 @@ server:
 mstpcap:
 	$(MAKE) -b -C mstpcap
 
+mstpcrc:
+	$(MAKE) -b -C mstpcrc
+
 iam:
 	$(MAKE) -b -C iam
 
diff --git a/bacnet-stack/demo/mstpcrc/build.bat b/bacnet-stack/demo/mstpcrc/build.bat
index 2c691717..9035ca9d 100644
--- a/bacnet-stack/demo/mstpcrc/build.bat
+++ b/bacnet-stack/demo/mstpcrc/build.bat
@@ -6,4 +6,4 @@ set CC=gcc
 set AR=ar
 set MAKE=make
 set TARGET_EXT=.exe
-make clean all
+make BACNET_PORT=win32 clean all