diff --git a/bacnet-stack/demo/iamrouter/makefile.b32 b/bacnet-stack/demo/iamrouter/makefile.b32
new file mode 100644
index 00000000..a76aa20a
--- /dev/null
+++ b/bacnet-stack/demo/iamrouter/makefile.b32
@@ -0,0 +1,135 @@
+#
+# Simple makefile to build an executable for Win32
+#
+# This makefile assumes Borland bcc32 development environment
+# on Windows NT/9x/2000/XP
+#
+
+!ifndef BORLAND_DIR
+BORLAND_DIR_Not_Defined:
+   @echo .
+   @echo You must define environment variable BORLAND_DIR to compile.
+!endif
+
+# target
+PRODUCT = baciamr
+PRODUCT_EXE = $(PRODUCT).exe
+
+# tools
+CC = $(BORLAND_DIR)\bin\bcc32
+MAKE=$(BORLAND_DIR)\bin\make.exe
+#LINK = $(BORLAND_DIR)\bin\tlink32
+LINK = $(BORLAND_DIR)\bin\ilink32
+
+BACNET_LIB_DIR = ..\..\lib
+BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
+
+# directories
+BACNET_PORT = ..\..\ports\win32
+BACNET_INCLUDE = ..\..\include
+INCLUDES = \ 
+	-I$(BACNET_INCLUDE) \
+	-I$(BACNET_PORT) \
+	-I$(BORLAND_DIR)\include
+
+#
+BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL
+#BACDL_DEFINE=-DBACDL_MSTP=1
+BACDL_DEFINE=-DBACDL_BIP=1 -DUSE_INADDR=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
+SRCS = main.c
+
+OBJS = $(SRCS:.c=.obj)
+
+#
+# Compiler definitions
+#
+BCC_CFG = bcc32.cfg
+
+#
+# Include directories
+#
+CFLAGS = $(INCLUDES) $(DEFINES)
+
+#
+# Libraries
+#
+C_LIB_DIR = $(BORLAND_DIR)\lib
+
+LIBS = $(BACNET_LIB) \
+	$(C_LIB_DIR)\IMPORT32.lib \
+	$(C_LIB_DIR)\CW32MT.lib \
+
+#
+# Main target
+#
+# This should be the first one in the makefile
+
+all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) 
+	del $(BCC_CFG)
+
+install: $(PRODUCT_EXE)
+	copy $(PRODUCT_EXE) ..\..\bin\$(PRODUCT_EXE)
+
+# Linker specific: the link below is for BCC linker/compiler. If you link
+# with a different linker - please change accordingly.
+#
+
+# need a temp response file (@&&| ... |) because command line is too long
+# $** lists each dependency
+# $< target name
+# $* target name without extension
+$(PRODUCT_EXE) : $(OBJS)
+	@echo Running Linker for $(PRODUCT_EXE)
+	$(LINK)	-L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&|
+	  $(BORLAND_DIR)\lib\c0x32.obj $**
+	$<
+	$*.map
+	$(LIBS)
+|
+
+#
+# Utilities
+
+clean :
+	del $(OBJS)
+	del $(PRODUCT_EXE)
+	del $(PRODUCT).map
+	del $(PRODUCT).ilc
+	del $(PRODUCT).ild
+	del $(PRODUCT).ilf
+	del $(PRODUCT).ils
+	del $(PRODUCT).tds
+	del $(BCC_CFG)
+
+#
+# Generic rules
+#
+.SUFFIXES: .cpp .c .sbr .obj
+
+#
+# cc generic rule
+#
+.c.obj:
+	$(CC) +$(BCC_CFG) -o$@ $<
+
+# Compiler configuration file
+$(BCC_CFG) :
+   Copy &&|
+$(CFLAGS)
+-c
+-y     #include line numbers in OBJ's
+-v     #include debug info
+-w+    #turn on all warnings
+-Od    #disable all optimizations
+#-a4    #32 bit data alignment
+#-M     # generate link map
+#-ls    # linker options
+#-WM-   #not multithread
+-WM    #multithread
+-w-aus # ignore warning assigned a value that is never used
+-w-sig # ignore warning conversion may lose sig digits
+| $@
+
+# EOF: makefile
diff --git a/bacnet-stack/demo/initrouter/makefile.b32 b/bacnet-stack/demo/initrouter/makefile.b32
new file mode 100644
index 00000000..85867cbd
--- /dev/null
+++ b/bacnet-stack/demo/initrouter/makefile.b32
@@ -0,0 +1,135 @@
+#
+# Simple makefile to build an executable for Win32
+#
+# This makefile assumes Borland bcc32 development environment
+# on Windows NT/9x/2000/XP
+#
+
+!ifndef BORLAND_DIR
+BORLAND_DIR_Not_Defined:
+   @echo .
+   @echo You must define environment variable BORLAND_DIR to compile.
+!endif
+
+# target
+PRODUCT = bacinitr
+PRODUCT_EXE = $(PRODUCT).exe
+
+# tools
+CC = $(BORLAND_DIR)\bin\bcc32
+MAKE=$(BORLAND_DIR)\bin\make.exe
+#LINK = $(BORLAND_DIR)\bin\tlink32
+LINK = $(BORLAND_DIR)\bin\ilink32
+
+BACNET_LIB_DIR = ..\..\lib
+BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
+
+# directories
+BACNET_PORT = ..\..\ports\win32
+BACNET_INCLUDE = ..\..\include
+INCLUDES = \ 
+	-I$(BACNET_INCLUDE) \
+	-I$(BACNET_PORT) \
+	-I$(BORLAND_DIR)\include
+
+#
+BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL
+#BACDL_DEFINE=-DBACDL_MSTP=1
+BACDL_DEFINE=-DBACDL_BIP=1 -DUSE_INADDR=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
+SRCS = main.c
+
+OBJS = $(SRCS:.c=.obj)
+
+#
+# Compiler definitions
+#
+BCC_CFG = bcc32.cfg
+
+#
+# Include directories
+#
+CFLAGS = $(INCLUDES) $(DEFINES)
+
+#
+# Libraries
+#
+C_LIB_DIR = $(BORLAND_DIR)\lib
+
+LIBS = $(BACNET_LIB) \
+	$(C_LIB_DIR)\IMPORT32.lib \
+	$(C_LIB_DIR)\CW32MT.lib \
+
+#
+# Main target
+#
+# This should be the first one in the makefile
+
+all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) 
+	del $(BCC_CFG)
+
+install: $(PRODUCT_EXE)
+	copy $(PRODUCT_EXE) ..\..\bin\$(PRODUCT_EXE)
+
+# Linker specific: the link below is for BCC linker/compiler. If you link
+# with a different linker - please change accordingly.
+#
+
+# need a temp response file (@&&| ... |) because command line is too long
+# $** lists each dependency
+# $< target name
+# $* target name without extension
+$(PRODUCT_EXE) : $(OBJS)
+	@echo Running Linker for $(PRODUCT_EXE)
+	$(LINK)	-L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&|
+	  $(BORLAND_DIR)\lib\c0x32.obj $**
+	$<
+	$*.map
+	$(LIBS)
+|
+
+#
+# Utilities
+
+clean :
+	del $(OBJS)
+	del $(PRODUCT_EXE)
+	del $(PRODUCT).map
+	del $(PRODUCT).ilc
+	del $(PRODUCT).ild
+	del $(PRODUCT).ilf
+	del $(PRODUCT).ils
+	del $(PRODUCT).tds
+	del $(BCC_CFG)
+
+#
+# Generic rules
+#
+.SUFFIXES: .cpp .c .sbr .obj
+
+#
+# cc generic rule
+#
+.c.obj:
+	$(CC) +$(BCC_CFG) -o$@ $<
+
+# Compiler configuration file
+$(BCC_CFG) :
+   Copy &&|
+$(CFLAGS)
+-c
+-y     #include line numbers in OBJ's
+-v     #include debug info
+-w+    #turn on all warnings
+-Od    #disable all optimizations
+#-a4    #32 bit data alignment
+#-M     # generate link map
+#-ls    # linker options
+#-WM-   #not multithread
+-WM    #multithread
+-w-aus # ignore warning assigned a value that is never used
+-w-sig # ignore warning conversion may lose sig digits
+| $@
+
+# EOF: makefile
diff --git a/bacnet-stack/demo/mstpcap/makefile.b32 b/bacnet-stack/demo/mstpcap/makefile.b32
new file mode 100644
index 00000000..1c4f327c
--- /dev/null
+++ b/bacnet-stack/demo/mstpcap/makefile.b32
@@ -0,0 +1,135 @@
+#
+# Simple makefile to build an executable for Win32
+#
+# This makefile assumes Borland bcc32 development environment
+# on Windows NT/9x/2000/XP
+#
+
+!ifndef BORLAND_DIR
+BORLAND_DIR_Not_Defined:
+   @echo .
+   @echo You must define environment variable BORLAND_DIR to compile.
+!endif
+
+# target
+PRODUCT = mstpcap
+PRODUCT_EXE = $(PRODUCT).exe
+
+# tools
+CC = $(BORLAND_DIR)\bin\bcc32
+MAKE=$(BORLAND_DIR)\bin\make.exe
+#LINK = $(BORLAND_DIR)\bin\tlink32
+LINK = $(BORLAND_DIR)\bin\ilink32
+
+BACNET_LIB_DIR = ..\..\lib
+BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
+
+# directories
+BACNET_PORT = ..\..\ports\win32
+BACNET_INCLUDE = ..\..\include
+INCLUDES = \ 
+	-I$(BACNET_INCLUDE) \
+	-I$(BACNET_PORT) \
+	-I$(BORLAND_DIR)\include
+
+#
+BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL
+#BACDL_DEFINE=-DBACDL_MSTP=1
+BACDL_DEFINE=-DBACDL_BIP=1 -DUSE_INADDR=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
+SRCS = main.c
+
+OBJS = $(SRCS:.c=.obj)
+
+#
+# Compiler definitions
+#
+BCC_CFG = bcc32.cfg
+
+#
+# Include directories
+#
+CFLAGS = $(INCLUDES) $(DEFINES)
+
+#
+# Libraries
+#
+C_LIB_DIR = $(BORLAND_DIR)\lib
+
+LIBS = $(BACNET_LIB) \
+	$(C_LIB_DIR)\IMPORT32.lib \
+	$(C_LIB_DIR)\CW32MT.lib \
+
+#
+# Main target
+#
+# This should be the first one in the makefile
+
+all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) 
+	del $(BCC_CFG)
+
+install: $(PRODUCT_EXE)
+	copy $(PRODUCT_EXE) ..\..\bin\$(PRODUCT_EXE)
+
+# Linker specific: the link below is for BCC linker/compiler. If you link
+# with a different linker - please change accordingly.
+#
+
+# need a temp response file (@&&| ... |) because command line is too long
+# $** lists each dependency
+# $< target name
+# $* target name without extension
+$(PRODUCT_EXE) : $(OBJS)
+	@echo Running Linker for $(PRODUCT_EXE)
+	$(LINK)	-L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&|
+	  $(BORLAND_DIR)\lib\c0x32.obj $**
+	$<
+	$*.map
+	$(LIBS)
+|
+
+#
+# Utilities
+
+clean :
+	del $(OBJS)
+	del $(PRODUCT_EXE)
+	del $(PRODUCT).map
+	del $(PRODUCT).ilc
+	del $(PRODUCT).ild
+	del $(PRODUCT).ilf
+	del $(PRODUCT).ils
+	del $(PRODUCT).tds
+	del $(BCC_CFG)
+
+#
+# Generic rules
+#
+.SUFFIXES: .cpp .c .sbr .obj
+
+#
+# cc generic rule
+#
+.c.obj:
+	$(CC) +$(BCC_CFG) -o$@ $<
+
+# Compiler configuration file
+$(BCC_CFG) :
+   Copy &&|
+$(CFLAGS)
+-c
+-y     #include line numbers in OBJ's
+-v     #include debug info
+-w+    #turn on all warnings
+-Od    #disable all optimizations
+#-a4    #32 bit data alignment
+#-M     # generate link map
+#-ls    # linker options
+#-WM-   #not multithread
+-WM    #multithread
+-w-aus # ignore warning assigned a value that is never used
+-w-sig # ignore warning conversion may lose sig digits
+| $@
+
+# EOF: makefile
diff --git a/bacnet-stack/demo/whoisrouter/makefile.b32 b/bacnet-stack/demo/whoisrouter/makefile.b32
new file mode 100644
index 00000000..cf06c282
--- /dev/null
+++ b/bacnet-stack/demo/whoisrouter/makefile.b32
@@ -0,0 +1,135 @@
+#
+# Simple makefile to build an executable for Win32
+#
+# This makefile assumes Borland bcc32 development environment
+# on Windows NT/9x/2000/XP
+#
+
+!ifndef BORLAND_DIR
+BORLAND_DIR_Not_Defined:
+   @echo .
+   @echo You must define environment variable BORLAND_DIR to compile.
+!endif
+
+# target
+PRODUCT = bacwir
+PRODUCT_EXE = $(PRODUCT).exe
+
+# tools
+CC = $(BORLAND_DIR)\bin\bcc32
+MAKE=$(BORLAND_DIR)\bin\make.exe
+#LINK = $(BORLAND_DIR)\bin\tlink32
+LINK = $(BORLAND_DIR)\bin\ilink32
+
+BACNET_LIB_DIR = ..\..\lib
+BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
+
+# directories
+BACNET_PORT = ..\..\ports\win32
+BACNET_INCLUDE = ..\..\include
+INCLUDES = \ 
+	-I$(BACNET_INCLUDE) \
+	-I$(BACNET_PORT) \
+	-I$(BORLAND_DIR)\include
+
+#
+BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL
+#BACDL_DEFINE=-DBACDL_MSTP=1
+BACDL_DEFINE=-DBACDL_BIP=1 -DUSE_INADDR=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
+SRCS = main.c
+
+OBJS = $(SRCS:.c=.obj)
+
+#
+# Compiler definitions
+#
+BCC_CFG = bcc32.cfg
+
+#
+# Include directories
+#
+CFLAGS = $(INCLUDES) $(DEFINES)
+
+#
+# Libraries
+#
+C_LIB_DIR = $(BORLAND_DIR)\lib
+
+LIBS = $(BACNET_LIB) \
+	$(C_LIB_DIR)\IMPORT32.lib \
+	$(C_LIB_DIR)\CW32MT.lib \
+
+#
+# Main target
+#
+# This should be the first one in the makefile
+
+all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) 
+	del $(BCC_CFG)
+
+install: $(PRODUCT_EXE)
+	copy $(PRODUCT_EXE) ..\..\bin\$(PRODUCT_EXE)
+
+# Linker specific: the link below is for BCC linker/compiler. If you link
+# with a different linker - please change accordingly.
+#
+
+# need a temp response file (@&&| ... |) because command line is too long
+# $** lists each dependency
+# $< target name
+# $* target name without extension
+$(PRODUCT_EXE) : $(OBJS)
+	@echo Running Linker for $(PRODUCT_EXE)
+	$(LINK)	-L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&|
+	  $(BORLAND_DIR)\lib\c0x32.obj $**
+	$<
+	$*.map
+	$(LIBS)
+|
+
+#
+# Utilities
+
+clean :
+	del $(OBJS)
+	del $(PRODUCT_EXE)
+	del $(PRODUCT).map
+	del $(PRODUCT).ilc
+	del $(PRODUCT).ild
+	del $(PRODUCT).ilf
+	del $(PRODUCT).ils
+	del $(PRODUCT).tds
+	del $(BCC_CFG)
+
+#
+# Generic rules
+#
+.SUFFIXES: .cpp .c .sbr .obj
+
+#
+# cc generic rule
+#
+.c.obj:
+	$(CC) +$(BCC_CFG) -o$@ $<
+
+# Compiler configuration file
+$(BCC_CFG) :
+   Copy &&|
+$(CFLAGS)
+-c
+-y     #include line numbers in OBJ's
+-v     #include debug info
+-w+    #turn on all warnings
+-Od    #disable all optimizations
+#-a4    #32 bit data alignment
+#-M     # generate link map
+#-ls    # linker options
+#-WM-   #not multithread
+-WM    #multithread
+-w-aus # ignore warning assigned a value that is never used
+-w-sig # ignore warning conversion may lose sig digits
+| $@
+
+# EOF: makefile
diff --git a/bacnet-stack/lib/makefile.b32 b/bacnet-stack/lib/makefile.b32
index 41adc65a..810f7385 100644
--- a/bacnet-stack/lib/makefile.b32
+++ b/bacnet-stack/lib/makefile.b32
@@ -98,6 +98,7 @@ HANDLER_SRC = $(BACNET_HANDLER)\txbuf.c \
 	$(BACNET_HANDLER)\s_iam.c  \
 	$(BACNET_HANDLER)\s_cov.c  \
 	$(BACNET_HANDLER)\s_rd.c \
+	$(BACNET_HANDLER)\s_router.c  \
 	$(BACNET_HANDLER)\s_rp.c  \
 	$(BACNET_HANDLER)\s_rpm.c  \
 	$(BACNET_HANDLER)\s_ts.c \
diff --git a/bacnet-stack/makefile.b32 b/bacnet-stack/makefile.b32
index 146f54f4..02557828 100644
--- a/bacnet-stack/makefile.b32
+++ b/bacnet-stack/makefile.b32
@@ -12,7 +12,8 @@ MAKE=$(BORLAND_DIR)\bin\make.exe
 
 all: library \
 	readprop writeprop readfile writefile server dcc reinit \
-	whois whohas timesync ucov epics readpropm
+	whois whohas timesync ucov epics readpropm \
+	whoisrouter iamrouter initrouter
 	@echo "demo utilities are in the bin directory"
 
 clean: lib\makefile.b32 \
@@ -84,6 +85,22 @@ clean: lib\makefile.b32 \
 	$(MAKE) -i -f makefile.b32 clean
 	cd ..
 	cd ..
+	cd demo/mstpcap
+	$(MAKE) -i -f makefile.b32 clean
+	cd ..
+	cd ..
+	cd demo/whoisrouter
+	$(MAKE) -i -f makefile.b32 clean
+	cd ..
+	cd ..
+	cd demo/iamrouter
+	$(MAKE) -i -f makefile.b32 clean
+	cd ..
+	cd ..
+	cd demo/initrouter
+	$(MAKE) -i -f makefile.b32 clean
+	cd ..
+	cd ..
 
 library: lib\makefile.b32
 	cd lib
@@ -180,3 +197,33 @@ timesync: demo/timesync/makefile.b32
 	$(MAKE) -f makefile.b32 install
 	cd ..
 	cd ..
+
+
+mstpcap: demo/mstpcap/makefile.b32
+	cd demo/mstpcap
+	$(MAKE) -f makefile.b32 all
+	$(MAKE) -f makefile.b32 install
+	cd ..
+	cd ..
+
+whoisrouter: demo/whoisrouter/makefile.b32
+	cd demo/whoisrouter
+	$(MAKE) -f makefile.b32 all
+	$(MAKE) -f makefile.b32 install
+	cd ..
+	cd ..
+
+iamrouter: demo/iamrouter/makefile.b32
+	cd demo/iamrouter
+	$(MAKE) -f makefile.b32 all
+	$(MAKE) -f makefile.b32 install
+	cd ..
+	cd ..
+
+initrouter: demo/initrouter/makefile.b32
+	cd demo/initrouter
+	$(MAKE) -f makefile.b32 all
+	$(MAKE) -f makefile.b32 install
+	cd ..
+	cd ..
+