diff --git a/timeserver/timeserver.c b/timeserver/timeserver.c
index 77c35bf..e015e64 100644
--- a/timeserver/timeserver.c
+++ b/timeserver/timeserver.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
         message[receivedDataLen] = '\0';
         printf("Message rec: %s", message);
         // if "time\r\n" is received, then send() back the linux epoch.
-        if(strcmp(message, "time\n") == 0)
+        if(strcmp(message, "time\n") == 0 || strcmp(message, "time\r\n") == 0)
         {
             //
             char reply[BUFFER_SIZE];