diff --git a/Makefile b/Makefile
index 61185e7..998fbed 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ $(SRCS):
 	$(CC) $(CFLAGS) -c $*.c
 
 tcpser: $(OBJS)
-	$(CC) -o $@ $(OBJS) $(LDFLAGS)
+	$(CC) -g -o $@ $(OBJS) $(LDFLAGS)
 
 depend: $(SRCS)
 	$(DEPEND) $(SRCS)
diff --git a/src/serial.c b/src/serial.c
index f1d2f83..4b63f1b 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -87,7 +87,7 @@ int ser_init_conn(char *tty, int speed)
     /* open the device to be non-blocking (read will return immediatly) */
     LOG(LOG_INFO, "Opening serial device");
 
-    fd = open(tty, O_RDWR | O_NOCTTY);
+    fd = open(tty, O_RDWR | O_NOCTTY | O_NONBLOCK);
 
     if (fd < 0) {
       ELOG(LOG_FATAL, "TTY %s could not be opened", tty);