diff --git a/kadmin/kadm_conn.c b/kadmin/kadm_conn.c
index d29864ad2..0817b7c93 100644
--- a/kadmin/kadm_conn.c
+++ b/kadmin/kadm_conn.c
@@ -288,6 +288,8 @@ start_server(krb5_context contextp, const char *port_str)
 		rk_closesocket(s);
 		continue;
 	    }
+
+	    socket_set_keepalive(s, 1);
 	    socks[num_socks++] = s;
 	}
 	freeaddrinfo (ai);
diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c
index f2ddac2f6..f88aec45c 100644
--- a/kadmin/kadmind.c
+++ b/kadmin/kadmind.c
@@ -204,6 +204,8 @@ main(int argc, char **argv)
 	}
 #endif /* _WIN32 */
 	sfd = STDIN_FILENO;
+
+	socket_set_keepalive(sfd, 1);
     }
 
     if(realm)