diff -U4 -r net/ipsvd-0.12.1/src/socket_bind.c net.new/ipsvd-0.12.1/src/socket_bind.c
--- net/ipsvd-0.12.1/src/socket_bind.c	2006-02-05 06:16:48.000000000 +1100
+++ net.new/ipsvd-0.12.1/src/socket_bind.c	2013-12-19 16:11:13.000000000 +1100
@@ -30,4 +30,10 @@
     if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,&size,sizeof size) == 0) return;
     size -= (size >> 5);
   }
 }
+
+int socket_keepalive(int s)
+{
+  int opt = 1;
+  return setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,&opt,sizeof opt);
+}
diff -U4 -r net/ipsvd-0.12.1/src/socket.h net.new/ipsvd-0.12.1/src/socket.h
--- net/ipsvd-0.12.1/src/socket.h	2006-02-05 06:16:48.000000000 +1100
+++ net.new/ipsvd-0.12.1/src/socket.h	2013-12-19 16:11:42.000000000 +1100
@@ -17,6 +17,7 @@
 extern int socket_local4(int,char *,uint16 *);
 extern int socket_remote4(int,char *,uint16 *);
 
 extern void socket_tryreservein(int,int);
+extern int socket_keepalive(int);
 
 #endif
diff -U4 -r net/ipsvd-0.12.1/src/tcpsvd.c net.new/ipsvd-0.12.1/src/tcpsvd.c
--- net/ipsvd-0.12.1/src/tcpsvd.c	2006-02-05 06:16:47.000000000 +1100
+++ net.new/ipsvd-0.12.1/src/tcpsvd.c	2013-12-19 16:24:28.000000000 +1100
@@ -31,11 +31,11 @@
 #include "ssl_io.h"
 #endif
 
 #ifdef SSLSVD
-#define USAGE " [-Ehpv] [-u user] [-c n] [-C n:msg] [-b n] [-l name] [-i dir|-x cdb] [-t sec] [-U ssluser] [-/ root] [-Z cert] [-K key] host port prog"
+#define USAGE " [-Ehkpv] [-u user] [-c n] [-C n:msg] [-b n] [-l name] [-i dir|-x cdb] [-t sec] [-U ssluser] [-/ root] [-Z cert] [-K key] host port prog"
 #else
-#define USAGE " [-Ehpv] [-u user] [-c n] [-C n:msg] [-b n] [-l name] [-i dir|-x cdb] [-t sec] host port prog"
+#define USAGE " [-Ehkpv] [-u user] [-c n] [-C n:msg] [-b n] [-l name] [-i dir|-x cdb] [-t sec] host port prog"
 #endif
 
 #define VERSION "$Id: tcpsvd.c,v 1.24 2006/02/03 19:30:24 pape Exp $"
 
@@ -53,8 +53,9 @@
 const char **prog;
 unsigned long cnum =0;
 unsigned long cmax =30;
 unsigned long timeout =0;
+unsigned int keepalive =0;
 
 unsigned int ucspi =1;
 const char *instructs =0;
 unsigned int iscdb =0;
@@ -240,8 +241,10 @@
   }
   else run =prog;
   if ((fd_move(0, c) == -1) || (fd_copy(1, 0) == -1))
     drop("unable to set filedescriptor");
+  if (keepalive)
+    socket_keepalive(0);
   sig_uncatch(sig_term);
   sig_uncatch(sig_pipe);
   sig_uncatch(sig_child);
   sig_unblock(sig_child);
@@ -270,12 +273,12 @@
   phccmax =0;
 
 #ifdef SSLSVD
   while ((opt =getopt(argc, (const char **)argv,
-                      "c:C:i:x:u:l:Eb:hpt:vVU:/:Z:K:")) != opteof) {
+                      "c:C:i:x:u:l:Eb:hkpt:vVU:/:Z:K:")) != opteof) {
 #else
   while ((opt =getopt(argc, (const char **)argv,
-                      "c:C:i:x:u:l:Eb:hpt:vV")) != opteof) {
+                      "c:C:i:x:u:l:Eb:hpkt:vV")) != opteof) {
 #endif
     switch(opt) {
     case 'c': scan_ulong(optarg, &cmax); if (cmax < 1) usage(); break;
     case 'C':
@@ -296,8 +299,9 @@
       break;
     case 'E': ucspi =0; break;
     case 'b': scan_ulong(optarg, &backlog); break;
     case 'h': lookuphost =1; break;
+    case 'k': keepalive =1; break;
     case 'p': lookuphost =1; paranoid =1; break;
     case 't': scan_ulong(optarg, &timeout); break;
     case 'v': ++verbose; break;
 #ifdef SSLSVD