diff --git a/bacnet-stack/ports/linux/rs485.c b/bacnet-stack/ports/linux/rs485.c
index 78854943..9dd627b9 100644
--- a/bacnet-stack/ports/linux/rs485.c
+++ b/bacnet-stack/ports/linux/rs485.c
@@ -226,6 +226,7 @@ void RS485_Initialize(
 {
     struct termios newtio;
 
+    printf("RS485: Initializing %s", RS485_Port_Name);
     /*
        Open device for reading and writing.
      */
@@ -264,6 +265,7 @@ void RS485_Initialize(
     tcsetattr(RS485_Handle, TCSAFLUSH, &newtio);
     /* destructor */
     atexit(RS485_Cleanup);
+    printf("=success!\n");
 }
 
 #ifdef TEST_RS485
diff --git a/bacnet-stack/ports/linux/rx_fsm.c b/bacnet-stack/ports/linux/rx_fsm.c
index a15ecb74..8ee194c3 100644
--- a/bacnet-stack/ports/linux/rx_fsm.c
+++ b/bacnet-stack/ports/linux/rx_fsm.c
@@ -184,6 +184,7 @@ int main(
     int rc = 0;
     pthread_t hThread;
     int my_mac = 127;
+    long my_baud = 38400;
 
     /* mimic our pointer in the state machine */
     mstp_port = &MSTP_Port;
@@ -192,11 +193,14 @@ int main(
         RS485_Set_Interface(argv[1]);
     }
     if (argc > 2) {
-        my_mac = strtol(argv[2], NULL, 0);
+        my_baud = strtol(argv[2], NULL, 0);
+    }
+    if (argc > 3) {
+        my_mac = strtol(argv[3], NULL, 0);
         if (my_mac > 127)
             my_mac = 127;
     }
-    RS485_Set_Baud_Rate(38400);
+    RS485_Set_Baud_Rate(my_baud);
     RS485_Initialize();
     MSTP_Port.InputBuffer = &RxBuffer[0];
     MSTP_Port.InputBufferSize = sizeof(RxBuffer);
diff --git a/bacnet-stack/ports/linux/rx_fsm.mak b/bacnet-stack/ports/linux/rx_fsm.mak
index 6a97d235..96dd7289 100644
--- a/bacnet-stack/ports/linux/rx_fsm.mak
+++ b/bacnet-stack/ports/linux/rx_fsm.mak
@@ -1,17 +1,18 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
+SRCDIR = ../../src
+INCDIR = ../../include
 # -g for debugging with gdb
 DEFINES = -DBIG_ENDIAN=0 -DBACDL_MSTP=1
-INCLUDES = -I. -I../../ 
+INCLUDES = -I. -I$(INCDIR)
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 SRCS = rs485.c \
 	rx_fsm.c \
-	../../mstp.c \
-	../../mstptext.c \
-	../../indtext.c \
-	../../crc.c
+	$(SRCDIR)/mstp.c \
+	$(SRCDIR)/mstptext.c \
+	$(SRCDIR)/indtext.c \
+	$(SRCDIR)/crc.c
 
 OBJS = ${SRCS:.c=.o}