diff --git a/echoserver/echoserver.c b/echoserver/echoserver.c
index 97b672d..23c5dce 100644
--- a/echoserver/echoserver.c
+++ b/echoserver/echoserver.c
@@ -17,6 +17,7 @@ int main(int argc, char **argv)
     int socketEchoFD;
     int clientEchoFD;
     int reuseAddrOpt = 1;
+    int keepAliveOpt = 1;
     char message[BUFFER_SIZE];
     int messageBytes;
     struct sockaddr_in serverAddr;
@@ -34,7 +35,8 @@ int main(int argc, char **argv)
     // use the setsockopt function to make the socket accept different configurations
     // allow for the reuse of the address/bind.
     setsockopt(socketEchoFD, SOL_SOCKET, SO_REUSEADDR, &reuseAddrOpt, sizeof(reuseAddrOpt));
-    // also need to set the socket to non-blocking using setsockopt?
+    // also need to set the socket to keepalive using setsockopt
+    setsockopt(socketEchoFD, SOL_SOCKET, SO_KEEPALIVE, &keepAliveOpt, sizeof(keepAliveOpt));
     // CODE HERE
     // bind the TCP socket to port 8888 / ECHOPORT
     serverAddr.sin_family = AF_INET;