diff --git a/nmrp.c b/nmrp.c
index a9f1e61..cd62503 100644
--- a/nmrp.c
+++ b/nmrp.c
@@ -652,7 +652,7 @@ int nmrp_do(struct nmrpd_args *args)
 				break;
 			case NMRP_C_KEEP_ALIVE_REQ:
 				tx.msg.code = NMRP_C_KEEP_ALIVE_ACK;
-				ethsock_set_timeout(sock, 15000);
+				ethsock_set_timeout(sock, args->ul_timeout);
 				printf("Received keep-alive request.\n");
 				break;
 			case NMRP_C_CLOSE_REQ: