diff --git a/src/init.c b/src/init.c
index 6ce0342..11be614 100644
--- a/src/init.c
+++ b/src/init.c
@@ -40,9 +40,8 @@ void print_help(char *name)
   exit(1);
 }
 
-int init(int argc,
-         char **argv,
-         modem_config cfg[], int max_modem, int *port, char *all_busy, int all_busy_len)
+int init(int argc, char **argv, modem_config cfg[], int max_modem, char **ip_addr,
+	 int *port, char *all_busy, int all_busy_len)
 {
   int i = 0;
   int j = 0;
@@ -110,7 +109,12 @@ int init(int argc,
       cfg[i].invert_dcd = TRUE;
       break;
     case 'p':
-      *port = (atoi(optarg));
+      if (strstr(optarg, ":") > 0) {
+	*ip_addr = strtok(optarg, ":");
+	*port = (atoi(strtok(NULL,":")));
+      }
+      else
+	*port = (atoi(optarg));
       break;
     case 'n':
       tok = strtok(optarg, "=");
diff --git a/src/init.h b/src/init.h
index f0030c2..6d9764c 100644
--- a/src/init.h
+++ b/src/init.h
@@ -5,7 +5,6 @@
 
 #include "modem_core.h"
 
-void print_help(char *name);
-int init(int argc,
-         char **argv,
-         modem_config cfg[], int max_modem, int *port, char *all_busy, int all_busy_len);
+extern void print_help(char *name);
+extern int init(int argc, char **argv, modem_config cfg[], int max_modem, char **ip_addr,
+		int *port, char *all_busy, int all_busy_len);
diff --git a/src/ip.c b/src/ip.c
index df5e142..06a1ad3 100644
--- a/src/ip.c
+++ b/src/ip.c
@@ -11,7 +11,7 @@
 
 const int BACK_LOG = 5;
 
-int ip_init_server_conn(int port)
+int ip_init_server_conn(char *ip_addr, int port)
 {
   int sSocket = 0, on = 0, rc = 0;
   struct sockaddr_in serverName = { 0 };
@@ -31,7 +31,7 @@ int ip_init_server_conn(int port)
      * turn off bind address checking, and allow 
      * port numbers to be reused - otherwise
      * the TIME_WAIT phenomenon will prevent 
-     * binding to these addreG.
+     * binding to these addresses.
      */
 
     on = 1;
@@ -42,11 +42,16 @@ int ip_init_server_conn(int port)
       ELOG(LOG_ERROR, "bind address checking could not be turned off");
     }
 
-    serverName.sin_addr.s_addr = htonl(INADDR_ANY);
+    if (ip_addr != NULL) /* gwb */
+      serverName.sin_addr.s_addr = inet_addr(ip_addr);
+    else 
+      serverName.sin_addr.s_addr = htonl(INADDR_ANY);
     serverName.sin_family = AF_INET;
 
     /* network-order */
     serverName.sin_port = htons(port);
+    if (ip_addr != NULL ) /* gwb */
+      LOG(LOG_DEBUG, "Using specified ip address %s", ip_addr);
 
     LOG(LOG_DEBUG, "Binding server socket to port %d", port);
     rc = bind(sSocket, (struct sockaddr *) &serverName, sizeof(serverName)
diff --git a/src/ip.h b/src/ip.h
index 19442a0..ce87559 100644
--- a/src/ip.h
+++ b/src/ip.h
@@ -6,12 +6,12 @@
 #define FALSE 0
 #endif
 
-int ip_init(void);
-int ip_init_server_conn(int port);
-int ip_connect(char addy[]);
-int ip_accept(int sSocket);
-int ip_disconnect(int fd);
-int ip_write(int fd, char *data, int len);
-int ip_read(int fd, char *data, int len);
+extern int ip_init(void);
+extern int ip_init_server_conn(char *ip_addr, int port);
+extern int ip_connect(char addy[]);
+extern int ip_accept(int sSocket);
+extern int ip_disconnect(int fd);
+extern int ip_write(int fd, char *data, int len);
+extern int ip_read(int fd, char *data, int len);
 
 #endif
diff --git a/src/ip232.c b/src/ip232.c
index 2ff671e..b0a62fe 100644
--- a/src/ip232.c
+++ b/src/ip232.c
@@ -93,7 +93,7 @@ int ip232_init_conn(modem_config *cfg)
   LOG_ENTER();
   LOG(LOG_INFO, "Opening ip232 device");
   port = atoi(cfg->dce_data.tty);
-  rc = ip_init_server_conn(port);
+  rc = ip_init_server_conn("", port);
   if (rc < 0) {
     ELOG(LOG_FATAL, "Could not initialize ip232 server socket");
     exit(-1);
diff --git a/src/line.c b/src/line.c
index 5efc2dd..450878f 100644
--- a/src/line.c
+++ b/src/line.c
@@ -76,6 +76,14 @@ int line_connect(modem_config *cfg)
   if (cfg->line_data.fd > -1) {
     LOG(LOG_ALL, "Connected to %s", addy);
     cfg->line_data.valid_conn = TRUE;
+    /* we need to let the other end know that our end will
+     * handle the echo - otherwise "true" telnet clients like
+     * those that come with Linux & Windows will echo characters
+     * typed and you'll end up with doubled characters if the remote
+     * host is echoing as well...
+     * - gwb
+     */
+    send_nvt_command(cfg->line_data.fd, &cfg->line_data.nvt_data, NVT_WILL, NVT_OPT_ECHO);
     return 0;
   }
   else {
diff --git a/src/tcpser.c b/src/tcpser.c
index 43efef9..5886e8d 100644
--- a/src/tcpser.c
+++ b/src/tcpser.c
@@ -23,6 +23,7 @@ int main(int argc, char *argv[])
   int modem_count;
   int port = 0;
 
+  char *ip_addr = NULL; /* gwb */
   char all_busy[255];
 
   pthread_t thread_id;
@@ -51,9 +52,9 @@ int main(int argc, char *argv[])
 
   signal(SIGIO, SIG_IGN);       /* Some Linux variant term on SIGIO by default */
 
-  modem_count = init(argc, argv, cfg, 64, &port, all_busy, sizeof(all_busy));
+  modem_count = init(argc, argv, cfg, 64, &ip_addr, &port,all_busy,sizeof(all_busy)); /* gwb */
 
-  sSocket = ip_init_server_conn(port);
+  sSocket = ip_init_server_conn(ip_addr, port);
 
   for (i = 0; i < modem_count; i++) {
     if (-1 == pipe(cfg[i].data.mp[0])) {