diff --git a/src/cfg.c b/src/cfg.c
index d28c99e..d5de585 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -61,7 +61,7 @@ cfg_init(void)
   strncpy(cfg.logname, LOGNAME, INTBUFSIZE);
 #endif
   strncpy(cfg.ttyport, DEFAULT_PORT, INTBUFSIZE);
-  cfg.ttyspeed = DEFAULT_SPEED;
+  cfg.ttyspeed = 0;
   strncpy(cfg.ttymode, DEFAULT_MODE, INTBUFSIZE);
 #ifdef TRXCTL
   cfg.trxcntl = TRX_ADDC;
@@ -73,7 +73,6 @@ cfg_init(void)
   cfg.maxtry = DEFAULT_MAXTRY;
   cfg.rqstpause = DEFAULT_RQSTPAUSE;
   cfg.respwait = DEFAULT_RESPWAIT;
-  cfg.resppause = DV(3, DEFAULT_BITS_PER_CHAR, cfg.ttyspeed);
   cfg.conntimeout = DEFAULT_CONNTIMEOUT;
 }
 
diff --git a/src/cfg.h b/src/cfg.h
index 5f4be57..40d8af6 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -72,8 +72,6 @@ typedef struct
   unsigned long rqstpause;
   /* response waiting time (in msec) */
   unsigned long respwait;
-  /* inter-byte response pause (in usec) */
-  unsigned long resppause;
 } cfg_t;
 
 /* Prototypes */
diff --git a/src/tty.c b/src/tty.c
index 319a3d3..5c69007 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -201,7 +201,7 @@ tty_transpeed(int speed)
   switch (speed)
   {
   case 0:
-    tspeed = B0;
+    tspeed = DEFAULT_BSPEED;
     break;
 #if defined(B50)
   case 50:
@@ -377,8 +377,8 @@ tty_transpeed(int speed)
     break;
 #endif
   default:
-    tspeed = DEFAULT_BSPEED;
-    break;
+    logw(2, "unsupported speed (%d)", speed);
+    exit (-1);
   }
   return tspeed;
 }