diff --git a/bacnet-stack/demo/Makefile b/bacnet-stack/demo/Makefile
index 47fbeab9..0444c8dd 100644
--- a/bacnet-stack/demo/Makefile
+++ b/bacnet-stack/demo/Makefile
@@ -62,24 +62,15 @@ ifeq (${BACDL_DEFINE},-DBACDL_BIP=1)
 	SUBDIRS += whoisrouter iamrouter initrouter readbdt
 endif
 
-# EKH: only include MSTP stuff if building targets MSTP or ALL. This allows us to compile under Cygwin, which has no support for RS485 (yet)
-# I searched for a clean way of doing the 'or' operation and the best I could come up with was http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
-addMSTP=
-ifdef BACDL_ALL
-	addMSTP = true 
-endif
-ifeq (${BACDL_DEFINE},-DBACDL_MSTP=1)
-	addMSTP = true 
-endif
-ifdef addMSTP			# if we want MSTP
-ifeq (${BACNET_PORT},linux)	# AND we are compiling under linux/cygwin
-SUBDIRS += mstpcap mstpcrc
+ifeq (${BACNET_PORT},linux)
+ifneq (${OSTYPE},cygwin) 
+	SUBDIRS += mstpcap mstpcrc
 #SUBDIRS += router
 endif
 endif
 
 ifeq (${BACNET_PORT},win32)
-SUBDIRS += ptransfer mstpcap mstpcrc
+	SUBDIRS += ptransfer mstpcap mstpcrc
 endif
 
 .PHONY : all gateway router clean
diff --git a/bacnet-stack/demo/mstpcap/main.c b/bacnet-stack/demo/mstpcap/main.c
index 1173e5a4..080f78f5 100644
--- a/bacnet-stack/demo/mstpcap/main.c
+++ b/bacnet-stack/demo/mstpcap/main.c
@@ -853,11 +853,7 @@ static void sig_int(
     if (FD_Pipe != -1) {
         close(FD_Pipe);
     }
-    /* signal to main loop to exit */
     Exit_Requested = true;
-    while (Exit_Requested) {
-        usleep(1000);
-    }
     exit(0);
 }